rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2299 files changed, 10010 insertions, 10010 deletions

diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
index db50c7d97..c76160c54 100644
--- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
@@ -38,9 +38,9 @@ namespace {
     const TQ_UINT8 PIXEL_MASK = 0;
 }
 
-KisAlphaColorSpace::KisAlphaColorSpace(KisColorSpaceFactoryRegistry * tqparent,
+KisAlphaColorSpace::KisAlphaColorSpace(KisColorSpaceFactoryRegistry * parent,
                                        KisProfile *p) :
-    KisU8BaseColorSpace(KisID("ALPHA", i18n("Alpha tqmask")),  TYPE_GRAY_8, icSigGrayData, tqparent, p)
+    KisU8BaseColorSpace(KisID("ALPHA", i18n("Alpha mask")),  TYPE_GRAY_8, icSigGrayData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Alpha"), i18n("A"), 0, KisChannelInfo::ALPHA, KisChannelInfo::UINT8));
     m_alphaPos = 0;
@@ -125,7 +125,7 @@ bool KisAlphaColorSpace::convertPixelsTo(const TQ_UINT8 *src,
 }
 
 
-//XXX bitblt of ColorSpaceAlpha does not take tqmask into consideration as this is probably not
+//XXX bitblt of ColorSpaceAlpha does not take mask into consideration as this is probably not
 // used ever
 void KisAlphaColorSpace::bitBlt(TQ_UINT8 *dst,
                 TQ_INT32 dststride,
diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h
index 173a809e3..c9deb496a 100644
--- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h
+++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h
@@ -24,12 +24,12 @@
 #include "kis_u8_base_colorspace.h"
 
 /**
- * The alpha tqmask is a special color strategy that treats all pixels as
- * alpha value with a colour common to the tqmask. The default color is white.
+ * The alpha mask is a special color strategy that treats all pixels as
+ * alpha value with a colour common to the mask. The default color is white.
  */
 class KisAlphaColorSpace : public KisU8BaseColorSpace {
 public:
-    KisAlphaColorSpace(KisColorSpaceFactoryRegistry * tqparent,
+    KisAlphaColorSpace(KisColorSpaceFactoryRegistry * parent,
                        KisProfile *p);
     virtual ~KisAlphaColorSpace();
 
diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
index e8476d75b..e6b7f1511 100644
--- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
@@ -33,10 +33,10 @@
 #include "kis_color_conversions.h"
 #include "kis_integer_maths.h"
 
-KisLabColorSpace::KisLabColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p)
+KisLabColorSpace::KisLabColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p)
     : KisU16BaseColorSpace(KisID("LABA", i18n("L*a*b* (16-bit integer/channel)")),
         COLORSPACE_SH(PT_Lab)|CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1),
-         icSigLabData, tqparent, p)
+         icSigLabData, parent, p)
 
 {
     m_channels.push_back(new KisChannelInfo(i18n("Lightness"), i18n("L"), CHANNEL_L * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQColor(100,100,100)));
@@ -267,19 +267,19 @@ void KisLabColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
     while (rows > 0) {
         const Pixel *src = reinterpret_cast<const Pixel *>(srcRowStart);
         Pixel *dst = reinterpret_cast<Pixel *>(dstRowStart);
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT16 srcAlpha = src->alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                if (*tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_MULT(srcAlpha, *tqmask);
+            // apply the alphamask
+            if (mask != 0) {
+                if (*mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_MULT(srcAlpha, *mask);
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha != U16_OPACITY_TRANSPARENT) {
@@ -351,20 +351,20 @@ void KisLabColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             TQ_UINT16 srcAlpha = s->alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = UINT16_MULT(srcAlpha, d->alpha);
         }
@@ -381,7 +381,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
@@ -395,7 +395,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_IN:
         //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -425,16 +425,16 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        //compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        //compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BUMPMAP:
         //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity);
         break;
     case COMPOSITE_COPY_RED:
         //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -469,22 +469,22 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
         // No composition.
         break;
     case COMPOSITE_DARKEN:
-        //compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        //compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLORIZE:
         //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -493,24 +493,24 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        //compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        //compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        //compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        //compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ALPHA_DARKEN:
         abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
                     CHANNEL_ALPHA, NUM_COLOR_CHANNELS, NUM_CHANNELS>(
-                    dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
+                    dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
                     rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
         break;
     default:
diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h
index e85408f8e..77266dca7 100644
--- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h
+++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h
@@ -29,7 +29,7 @@
 
 class KisLabColorSpace : public KisU16BaseColorSpace {
 public:
-    KisLabColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisLabColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisLabColorSpace();
 
 public:
@@ -87,22 +87,22 @@ protected:
                 TQ_INT32 cols,
                 const KisCompositeOp& op);
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
 /*
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
 */
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
 
 private:
     struct Pixel {
@@ -145,7 +145,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigLabData; };
     
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisLabColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisLabColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "Lab built-in - (lcms internal)"; };
 };
diff --git a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
index 7e765d7ab..d81c1fe65 100644
--- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
@@ -39,9 +39,9 @@
 // XXX: Maybe use TYPE_XYZ_DBL for an extra stimulating performance hit? People shouldn't depend
 //      on this fallback...
 
-KisXyzColorSpace::KisXyzColorSpace(KisColorSpaceFactoryRegistry * tqparent,
+KisXyzColorSpace::KisXyzColorSpace(KisColorSpaceFactoryRegistry * parent,
                                    KisProfile *p) :
-    KisU16BaseColorSpace(KisID("XYZA", i18n("XYZ/Alpha")), (COLORSPACE_SH(PT_XYZ)|CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)), icSigCmykData, tqparent, p)
+    KisU16BaseColorSpace(KisID("XYZA", i18n("XYZ/Alpha")), (COLORSPACE_SH(PT_XYZ)|CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)), icSigCmykData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("X"), i18n("X"), 0, KisChannelInfo::COLOR, KisChannelInfo::UINT8));
     m_channels.push_back(new KisChannelInfo(i18n("Y"), i18n("Y"), 1, KisChannelInfo::COLOR, KisChannelInfo::UINT8));
@@ -125,21 +125,21 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT16 srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha != U16_OPACITY_TRANSPARENT) {
@@ -198,7 +198,7 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \
         TQ_INT32 columns = numColumns; \
-        const TQ_UINT8 *tqmask = maskRowStart; \
+        const TQ_UINT8 *mask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -207,13 +207,13 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
     \
             srcAlpha = TQMIN(srcAlpha, dstAlpha); \
     \
-            if (tqmask != 0) { \
-                TQ_UINT8 U8_tqmask = *tqmask; \
+            if (mask != 0) { \
+                TQ_UINT8 U8_mask = *mask; \
     \
-                if (U8_tqmask != OPACITY_OPAQUE) { \
-                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); \
+                if (U8_mask != OPACITY_OPAQUE) { \
+                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); \
                 } \
-                tqmask++; \
+                mask++; \
             } \
     \
             if (srcAlpha != U16_OPACITY_TRANSPARENT) { \
@@ -437,20 +437,20 @@ void KisXyzColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             TQ_UINT16 srcAlpha = s -> alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
             d -> alpha = UINT16_MULT(srcAlpha, d -> alpha);
         }
@@ -467,7 +467,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
@@ -481,7 +481,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_IN:
         //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -510,16 +510,16 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BUMPMAP:
         //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity);
         break;
     case COMPOSITE_COPY_RED:
         //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -554,22 +554,22 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
         // No composition.
         break;
     case COMPOSITE_DARKEN:
-        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLORIZE:
         //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -578,24 +578,24 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ALPHA_DARKEN:
         abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
                     PIXEL_ALPHA, xyz::MAX_CHANNEL_XYZ, xyz::MAX_CHANNEL_XYZA>(
-                    dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
+                    dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
                     rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
         break;
     default:
diff --git a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h
index 4a785825c..ae8aad866 100644
--- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h
+++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h
@@ -43,7 +43,7 @@ public:
     };
 
 public:
-    KisXyzColorSpace(KisColorSpaceFactoryRegistry * tqparent,
+    KisXyzColorSpace(KisColorSpaceFactoryRegistry * parent,
                      KisProfile *p);
     virtual ~KisXyzColorSpace();
 
@@ -87,16 +87,16 @@ public:
     KisCompositeOpList userVisiblecompositeOps() const;
 
 protected:
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
 
 private:
 
diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cc
index f532f18eb..f81d6b335 100644
--- a/chalk/chalkcolor/kis_abstract_colorspace.cc
+++ b/chalk/chalkcolor/kis_abstract_colorspace.cc
@@ -63,9 +63,9 @@ class KisColorAdjustmentImpl : public KisColorAdjustment
 KisAbstractColorSpace::KisAbstractColorSpace(const KisID& id,
                                              DWORD cmType,
                                              icColorSpaceSignature colorSpaceSignature,
-                                             KisColorSpaceFactoryRegistry * tqparent,
+                                             KisColorSpaceFactoryRegistry * parent,
                                              KisProfile *p)
-    : m_parent( tqparent )
+    : m_parent( parent )
     , m_profile( p )
     , m_id( id )
     , m_cmType( cmType )
diff --git a/chalk/chalkcolor/kis_abstract_colorspace.h b/chalk/chalkcolor/kis_abstract_colorspace.h
index 732918d46..67f3c595b 100644
--- a/chalk/chalkcolor/kis_abstract_colorspace.h
+++ b/chalk/chalkcolor/kis_abstract_colorspace.h
@@ -53,13 +53,13 @@ public:
      * @param id The unique human and machine readable identifiation of this colorspace
      * @param cmType the lcms type indentification for this colorspace, may be 0
      * @param colorSpaceSignature the icc identification for this colorspace, may be 0
-     * @param tqparent the registry that owns this instance
+     * @param parent the registry that owns this instance
      * @param profile the profile this colorspace uses for transforms
      */
     KisAbstractColorSpace(const KisID & id,
                           DWORD cmType,
                           icColorSpaceSignature colorSpaceSignature,
-                          KisColorSpaceFactoryRegistry * tqparent,
+                          KisColorSpaceFactoryRegistry * parent,
                           KisProfile *profile);
 
     void init();
@@ -229,7 +229,7 @@ protected:
 
             const ColorType *src = reinterpret_cast<const ColorType*>(srcRowStart);
             ColorType *dst = reinterpret_cast<ColorType*>(dstRowStart);
-            const TQ_UINT8 *tqmask = maskRowStart;
+            const TQ_UINT8 *mask = maskRowStart;
             TQ_INT32 columns = numColumns;
 
             while (columns > 0) {
@@ -237,12 +237,12 @@ protected:
                 ColorType srcAlpha = src[AlphaPos];
                 ColorType dstAlpha = dst[AlphaPos];
 
-                // apply the alphatqmask
-                if(tqmask != 0)
+                // apply the alphamask
+                if(mask != 0)
                 {
-                    if(*tqmask != OPACITY_OPAQUE)
-                        srcAlpha = nativeMult(srcAlpha, uint8ToNative(*tqmask));
-                    tqmask++;
+                    if(*mask != OPACITY_OPAQUE)
+                        srcAlpha = nativeMult(srcAlpha, uint8ToNative(*mask));
+                    mask++;
                 }
 
                 if (opacity != OPACITY_OPAQUE) {
diff --git a/chalk/chalkcolor/kis_colorspace.h b/chalk/chalkcolor/kis_colorspace.h
index 1ce2ac6a4..c1482df53 100644
--- a/chalk/chalkcolor/kis_colorspace.h
+++ b/chalk/chalkcolor/kis_colorspace.h
@@ -314,14 +314,14 @@ public:
     virtual void multiplyAlpha(TQ_UINT8 * pixels, TQ_UINT8 alpha, TQ_INT32 nPixels) = 0;
 
     /**
-     * Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just
+     * Applies the specified 8-bit alpha mask to the pixels. We assume that there are just
      * as many alpha values as pixels but we do not check this; the alpha values
      * are assumed to be 8-bits.
      */
     virtual void applyAlphaU8Mask(TQ_UINT8 * pixels, TQ_UINT8 * alpha, TQ_INT32 nPixels) = 0;
 
     /**
-     * Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just
+     * Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just
      * as many alpha values as pixels but we do not check this; the alpha values
      * are assumed to be 8-bits.
      */
@@ -436,7 +436,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() = 0;
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *) = 0;
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *) = 0;
 
     /**
      * Returns the default icc profile for use with this colorspace. This may be ""
diff --git a/chalk/chalkcolor/kis_colorspace_iface.cc b/chalk/chalkcolor/kis_colorspace_iface.cc
index 6e6b3cb86..d2462c0c9 100644
--- a/chalk/chalkcolor/kis_colorspace_iface.cc
+++ b/chalk/chalkcolor/kis_colorspace_iface.cc
@@ -24,10 +24,10 @@
 
 #include <dcopclient.h>
 
-KisColorSpaceIface::KisColorSpaceIface( KisColorSpace * tqparent )
-	: DCOPObject(tqparent->id().id().latin1())
+KisColorSpaceIface::KisColorSpaceIface( KisColorSpace * parent )
+	: DCOPObject(parent->id().id().latin1())
 {
-	m_parent = tqparent;
+	m_parent = parent;
 }
 
 TQByteArray KisColorSpaceIface::invertColor(TQByteArray src, TQ_INT32 nPixels)
diff --git a/chalk/chalkcolor/kis_colorspace_iface.h b/chalk/chalkcolor/kis_colorspace_iface.h
index ce52e8469..3c1321276 100644
--- a/chalk/chalkcolor/kis_colorspace_iface.h
+++ b/chalk/chalkcolor/kis_colorspace_iface.h
@@ -30,7 +30,7 @@ class KisColorSpaceIface : public DCOPObject
 {
 	K_DCOP
 public:
-	KisColorSpaceIface( KisColorSpace * tqparent );
+	KisColorSpaceIface( KisColorSpace * parent );
 k_dcop:
 
     TQByteArray invertColor(TQByteArray src, TQ_INT32 nPixels);
diff --git a/chalk/chalkcolor/kis_f16half_base_colorspace.h b/chalk/chalkcolor/kis_f16half_base_colorspace.h
index ff1dbf8c5..802175ac6 100644
--- a/chalk/chalkcolor/kis_f16half_base_colorspace.h
+++ b/chalk/chalkcolor/kis_f16half_base_colorspace.h
@@ -63,9 +63,9 @@ class KisF16HalfBaseColorSpace : public KisAbstractColorSpace {
 public:
 
     KisF16HalfBaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature,
-                             KisColorSpaceFactoryRegistry * tqparent,
+                             KisColorSpaceFactoryRegistry * parent,
                              KisProfile *p)
-	: KisAbstractColorSpace(id, cmType, colorSpaceSignature, tqparent, p)
+	: KisAbstractColorSpace(id, cmType, colorSpaceSignature, parent, p)
     {
         m_alphaSize = sizeof(half);
     };
diff --git a/chalk/chalkcolor/kis_f32_base_colorspace.h b/chalk/chalkcolor/kis_f32_base_colorspace.h
index 60ecb9aa6..06efa65fb 100644
--- a/chalk/chalkcolor/kis_f32_base_colorspace.h
+++ b/chalk/chalkcolor/kis_f32_base_colorspace.h
@@ -58,8 +58,8 @@ class KisF32BaseColorSpace : public KisAbstractColorSpace {
 
 public:
 
-    KisF32BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, KisColorSpaceFactoryRegistry * tqparent, KisProfile *p)
-	: KisAbstractColorSpace(id, cmType, colorSpaceSignature, tqparent, p)
+    KisF32BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, KisColorSpaceFactoryRegistry * parent, KisProfile *p)
+	: KisAbstractColorSpace(id, cmType, colorSpaceSignature, parent, p)
     {
 	m_alphaSize = sizeof(float);
     };
diff --git a/chalk/chalkcolor/kis_u16_base_colorspace.h b/chalk/chalkcolor/kis_u16_base_colorspace.h
index 756ab9b53..46f0939d0 100644
--- a/chalk/chalkcolor/kis_u16_base_colorspace.h
+++ b/chalk/chalkcolor/kis_u16_base_colorspace.h
@@ -37,10 +37,10 @@ public:
 public:
 
     KisU16BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature,
-                         KisColorSpaceFactoryRegistry * tqparent,
+                         KisColorSpaceFactoryRegistry * parent,
                          KisProfile *p)
 	: KisAbstractColorSpace(id, cmType, colorSpaceSignature,
-                                tqparent,
+                                parent,
                                 p)
     {
 	    m_alphaSize = sizeof(TQ_UINT16);
diff --git a/chalk/chalkcolor/kis_u8_base_colorspace.h b/chalk/chalkcolor/kis_u8_base_colorspace.h
index 098a1f59c..997a0c839 100644
--- a/chalk/chalkcolor/kis_u8_base_colorspace.h
+++ b/chalk/chalkcolor/kis_u8_base_colorspace.h
@@ -34,9 +34,9 @@ class KisU8BaseColorSpace : public KisAbstractColorSpace {
 public:
 
     KisU8BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature,
-                        KisColorSpaceFactoryRegistry * tqparent,
+                        KisColorSpaceFactoryRegistry * parent,
                         KisProfile *p)
-	: KisAbstractColorSpace(id, cmType, colorSpaceSignature, tqparent, p)
+	: KisAbstractColorSpace(id, cmType, colorSpaceSignature, parent, p)
     {
 	m_alphaSize = sizeof(TQ_UINT8);
     };
diff --git a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc
index d694133e5..74c8f1656 100644
--- a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc
+++ b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc
@@ -34,14 +34,14 @@ typedef KGenericFactory<CMYKU16Plugin> CMYKU16PluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalk_cmyk_u16_plugin, CMYKU16PluginFactory( "chalk" ) )
 
 
-CMYKU16Plugin::CMYKU16Plugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+CMYKU16Plugin::CMYKU16Plugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(CMYKU16PluginFactory::instance());
 
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
 
         KisColorSpace * colorSpaceCMYKU16 = new KisCmykU16ColorSpace(f, 0);
         KisColorSpaceFactory * csf = new KisCmykU16ColorSpaceFactory();
diff --git a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h
index 07224a141..0a38b98ec 100644
--- a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h
+++ b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h
@@ -29,7 +29,7 @@ class CMYKU16Plugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    CMYKU16Plugin(TQObject *tqparent, const char *name, const TQStringList &);
+    CMYKU16Plugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~CMYKU16Plugin();
 
 };
diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
index 58ed38576..4799a92a2 100644
--- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
+++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
@@ -40,8 +40,8 @@ namespace {
     const TQ_INT32 MAX_CHANNEL_CMYKA = 5;
 }
 
-KisCmykU16ColorSpace::KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisU16BaseColorSpace(KisID("CMYKA16", i18n("CMYK (16-bit integer/channel)")), TYPE_CMYK5_16, icSigCmykData, tqparent, p)
+KisCmykU16ColorSpace::KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisU16BaseColorSpace(KisID("CMYKA16", i18n("CMYK (16-bit integer/channel)")), TYPE_CMYK5_16, icSigCmykData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Cyan"), i18n("C"), 0 * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQt::cyan));
     m_channels.push_back(new KisChannelInfo(i18n("Magenta"), i18n("M"), 1 * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQt::magenta));
@@ -216,21 +216,21 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT16 srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha != U16_OPACITY_TRANSPARENT) {
@@ -290,7 +290,7 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \
         TQ_INT32 columns = numColumns; \
-        const TQ_UINT8 *tqmask = maskRowStart; \
+        const TQ_UINT8 *mask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -299,13 +299,13 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
     \
             srcAlpha = TQMIN(srcAlpha, dstAlpha); \
     \
-            if (tqmask != 0) { \
-                TQ_UINT8 U8_tqmask = *tqmask; \
+            if (mask != 0) { \
+                TQ_UINT8 U8_mask = *mask; \
     \
-                if (U8_tqmask != OPACITY_OPAQUE) { \
-                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); \
+                if (U8_mask != OPACITY_OPAQUE) { \
+                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); \
                 } \
-                tqmask++; \
+                mask++; \
             } \
     \
             if (srcAlpha != U16_OPACITY_TRANSPARENT) { \
@@ -528,20 +528,20 @@ void KisCmykU16ColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             TQ_UINT16 srcAlpha = s->alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = UINT16_MULT(srcAlpha, d->alpha);
         }
@@ -559,7 +559,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
@@ -573,7 +573,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_IN:
         //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -602,16 +602,16 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BUMPMAP:
         //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity);
         break;
     case COMPOSITE_COPY_CYAN:
         //compositeCopyCyan(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -646,22 +646,22 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         // No composition.
         break;
     case COMPOSITE_DARKEN:
-        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLORIZE:
         //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -670,24 +670,24 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ALPHA_DARKEN:
         abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
                                      PIXEL_ALPHA, MAX_CHANNEL_CMYK, MAX_CHANNEL_CMYKA>(
-                dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
+                dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
                 rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
             break;
     default:
diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h
index c617607c7..8acea2819 100644
--- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h
+++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h
@@ -39,7 +39,7 @@ public:
     };
 
 public:
-    KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisCmykU16ColorSpace();
 
     virtual bool willDegrade(ColorSpaceIndependence independence)
@@ -78,16 +78,16 @@ protected:
                 TQ_INT32 cols,
                 const KisCompositeOp& op);
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
 
 private:
     friend class KisCmykU16ColorSpaceTester;
@@ -115,7 +115,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigCmykData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisCmykU16ColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisCmykU16ColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "Offset printing, according to ISO/DIS 12647-2:2004, OFCOM, paper type 1 or 2 = coated art, 115 g/m2, screen ruling 60 cm-1, positive-acting plates"; };
 };
diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
index 686a22bfa..6e349ad5c 100644
--- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
+++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
@@ -39,13 +39,13 @@ typedef KGenericFactory<CMYKPlugin> CMYKPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkcmykplugin, CMYKPluginFactory( "chalk" ) )
 
 
-CMYKPlugin::CMYKPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+CMYKPlugin::CMYKPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(CMYKPluginFactory::instance());
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
 
         KisColorSpace * colorSpaceCMYK = new KisCmykColorSpace(f, 0);
         KisColorSpaceFactory * csf = new KisCmykColorSpaceFactory();
diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h
index 073a5e613..a43b04bb5 100644
--- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h
+++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h
@@ -29,7 +29,7 @@ class CMYKPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    CMYKPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    CMYKPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~CMYKPlugin();
 
 
diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
index bfe85f0d8..359c22c5c 100644
--- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
+++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
@@ -37,8 +37,8 @@ namespace cmyk {
     const TQ_INT32 MAX_CHANNEL_CMYKA = 5;
 }
 
-KisCmykColorSpace::KisCmykColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisU8BaseColorSpace(KisID("CMYK", i18n("CMYK")), TYPE_CMYK5_8, icSigCmykData, tqparent, p)
+KisCmykColorSpace::KisCmykColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisU8BaseColorSpace(KisID("CMYK", i18n("CMYK")), TYPE_CMYK5_8, icSigCmykData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Cyan"), i18n("C"), 0, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, TQt::cyan));
     m_channels.push_back(new KisChannelInfo(i18n("Magenta"), i18n("M"), 1, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, TQt::magenta));
@@ -214,21 +214,21 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT8 srcAlpha = src[PIXEL_CMYK_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT8_MULT(srcAlpha, U8_tqmask);
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT8_MULT(srcAlpha, U8_mask);
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -288,7 +288,7 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         const TQ_UINT8 *src = srcRowStart; \
         TQ_UINT8 *dst = dstRowStart; \
         TQ_INT32 columns = numColumns; \
-        const TQ_UINT8 *tqmask = maskRowStart; \
+        const TQ_UINT8 *mask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -297,13 +297,13 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
     \
             srcAlpha = TQMIN(srcAlpha, dstAlpha); \
     \
-            if (tqmask != 0) { \
-                TQ_UINT8 U8_tqmask = *tqmask; \
+            if (mask != 0) { \
+                TQ_UINT8 U8_mask = *mask; \
     \
-                if (U8_tqmask != OPACITY_OPAQUE) { \
-                    srcAlpha = UINT8_MULT(srcAlpha, U8_tqmask); \
+                if (U8_mask != OPACITY_OPAQUE) { \
+                    srcAlpha = UINT8_MULT(srcAlpha, U8_mask); \
 } \
-                tqmask++; \
+                mask++; \
 } \
     \
             if (srcAlpha != OPACITY_TRANSPARENT) { \
@@ -526,20 +526,20 @@ void KisCmykColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             TQ_UINT8 srcAlpha = s->alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, U8_tqmask);
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, U8_mask);
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = UINT8_MULT(srcAlpha, d->alpha);
         }
@@ -556,7 +556,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
                                   TQ_INT32 dstRowStride,
                                   const TQ_UINT8 *src,
                                   TQ_INT32 srcRowStride,
-                                  const TQ_UINT8 *tqmask,
+                                  const TQ_UINT8 *mask,
                                   TQ_INT32 maskRowStride,
                                   TQ_UINT8 opacity,
                                   TQ_INT32 rows,
@@ -569,7 +569,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
             break;
         case COMPOSITE_OVER:
-            compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_IN:
         //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -598,16 +598,16 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_MULT:
-            compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_DIVIDE:
-            compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_BUMPMAP:
         //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COPY:
-            compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COPY_CYAN:
         //compositeCopyCyan(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -642,22 +642,22 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
         // No composition.
             break;
         case COMPOSITE_DARKEN:
-            compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_LIGHTEN:
-            compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COLORIZE:
         //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -666,24 +666,24 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_SCREEN:
-            compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_OVERLAY:
-            compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_ERASE:
-            compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_DODGE:
-            compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_BURN:
-            compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_ALPHA_DARKEN:
             abstractCompositeAlphaDarken<TQ_UINT8, U8Mult, Uint8ToU8, U8OpacityTest,
                     PIXEL_CMYK_ALPHA, cmyk::MAX_CHANNEL_CMYK, cmyk::MAX_CHANNEL_CMYKA>(
-                    dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
+                    dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
                     rows, cols, opacity, U8Mult(), Uint8ToU8(), U8OpacityTest());
                     break;
         default:
diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h
index a77239159..b3806bc44 100644
--- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h
+++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h
@@ -37,7 +37,7 @@ public:
             TQ_UINT16 alpha;
         };
 public:
-    KisCmykColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisCmykColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisCmykColorSpace();
 
 
@@ -80,16 +80,16 @@ protected:
                         TQ_INT32 cols,
                         const KisCompositeOp& op);
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
 
 private:
 
@@ -118,7 +118,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigCmykData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisCmykColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisCmykColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "Offset printing, according to ISO/DIS 12647-2:2004, OFCOM, paper type 1 or 2 = coated art, 115 g/m2, screen ruling 60 cm-1, positive-acting plates"; }; //  Do not i18n -- this is from a data file
 };
diff --git a/chalk/colorspaces/gray_u16/gray_u16_plugin.cc b/chalk/colorspaces/gray_u16/gray_u16_plugin.cc
index 436caf5db..bfb68e8cb 100644
--- a/chalk/colorspaces/gray_u16/gray_u16_plugin.cc
+++ b/chalk/colorspaces/gray_u16/gray_u16_plugin.cc
@@ -35,14 +35,14 @@ typedef KGenericFactory<GRAYU16Plugin> GRAYU16PluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalk_gray_u16_plugin, GRAYU16PluginFactory( "chalk" ) )
 
 
-GRAYU16Plugin::GRAYU16Plugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+GRAYU16Plugin::GRAYU16Plugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(GRAYU16PluginFactory::instance());
 
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
 
         KisColorSpace * colorSpaceGRAYU16 = new KisGrayU16ColorSpace(f, 0);
         KisColorSpaceFactory * csf = new KisGrayU16ColorSpaceFactory();
diff --git a/chalk/colorspaces/gray_u16/gray_u16_plugin.h b/chalk/colorspaces/gray_u16/gray_u16_plugin.h
index 39ef6c2ac..3d16c1acd 100644
--- a/chalk/colorspaces/gray_u16/gray_u16_plugin.h
+++ b/chalk/colorspaces/gray_u16/gray_u16_plugin.h
@@ -29,7 +29,7 @@ class GRAYU16Plugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    GRAYU16Plugin(TQObject *tqparent, const char *name, const TQStringList &);
+    GRAYU16Plugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~GRAYU16Plugin();
 
 };
diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
index 4e50b1c20..34cf991ab 100644
--- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
+++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
@@ -39,8 +39,8 @@ namespace {
     const TQ_INT32 MAX_CHANNEL_GRAYA = 2;
 }
 
-KisGrayU16ColorSpace::KisGrayU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisU16BaseColorSpace(KisID("GRAYA16", i18n("Grayscale (16-bit integer/channel)")), TYPE_GRAYA_16, icSigGrayData, tqparent, p)
+KisGrayU16ColorSpace::KisGrayU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisU16BaseColorSpace(KisID("GRAYA16", i18n("Grayscale (16-bit integer/channel)")), TYPE_GRAYA_16, icSigGrayData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Gray"), i18n("G"), PIXEL_GRAY * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16)));
     m_channels.push_back(new KisChannelInfo(i18n("Alpha"), i18n("A"), PIXEL_ALPHA * sizeof(TQ_UINT16), KisChannelInfo::ALPHA, KisChannelInfo::UINT16, sizeof(TQ_UINT16)));
@@ -167,21 +167,21 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT16 srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha != U16_OPACITY_TRANSPARENT) {
@@ -238,7 +238,7 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \
         TQ_INT32 columns = numColumns; \
-        const TQ_UINT8 *tqmask = maskRowStart; \
+        const TQ_UINT8 *mask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -247,13 +247,13 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
     \
             srcAlpha = TQMIN(srcAlpha, dstAlpha); \
     \
-            if (tqmask != 0) { \
-                TQ_UINT8 U8_tqmask = *tqmask; \
+            if (mask != 0) { \
+                TQ_UINT8 U8_mask = *mask; \
     \
-                if (U8_tqmask != OPACITY_OPAQUE) { \
-                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); \
+                if (U8_mask != OPACITY_OPAQUE) { \
+                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); \
                 } \
-                tqmask++; \
+                mask++; \
             } \
     \
             if (srcAlpha != U16_OPACITY_TRANSPARENT) { \
@@ -473,20 +473,20 @@ void KisGrayU16ColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             TQ_UINT16 srcAlpha = s->alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = UINT16_MULT(srcAlpha, d->alpha);
         }
@@ -503,7 +503,7 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
@@ -517,7 +517,7 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_IN:
         //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -546,16 +546,16 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BUMPMAP:
         //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity);
         break;
     case COMPOSITE_COPY_RED:
         //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -590,22 +590,22 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         // No composition.
         break;
     case COMPOSITE_DARKEN:
-        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLORIZE:
         //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -614,24 +614,24 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ALPHA_DARKEN:
         abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
                     PIXEL_ALPHA, MAX_CHANNEL_GRAY, MAX_CHANNEL_GRAYA>(
-                    dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
+                    dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
                     rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
         break;
     default:
diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h
index eeec10a7c..0acecd0b1 100644
--- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h
+++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h
@@ -46,7 +46,7 @@ public:
 
 
 public:
-    KisGrayU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisGrayU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisGrayU16ColorSpace();
 
 public:
@@ -76,16 +76,16 @@ protected:
                 TQ_INT32 cols,
                 const KisCompositeOp& op);
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
 
 private:
     friend class KisGrayU16ColorSpaceTester;
@@ -110,7 +110,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigGrayData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisGrayU16ColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisGrayU16ColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "gray built-in - (lcms internal)"; };
 };
diff --git a/chalk/colorspaces/gray_u8/gray_plugin.cc b/chalk/colorspaces/gray_u8/gray_plugin.cc
index 0028c5978..c0a207b38 100644
--- a/chalk/colorspaces/gray_u8/gray_plugin.cc
+++ b/chalk/colorspaces/gray_u8/gray_plugin.cc
@@ -37,16 +37,16 @@ typedef KGenericFactory<GrayPlugin> GrayPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkgrayplugin, GrayPluginFactory( "chalkcore" ) )
 
 
-GrayPlugin::GrayPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+GrayPlugin::GrayPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
            setInstance(GrayPluginFactory::instance());
 
     // This is not a gui plugin; only load it when the doc is created.
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
 
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
 
         // .22 gamma grayscale or something like that. Taken from the lcms tutorial...
         LPGAMMATABLE Gamma = cmsBuildGamma(256, 2.2);
diff --git a/chalk/colorspaces/gray_u8/gray_plugin.h b/chalk/colorspaces/gray_u8/gray_plugin.h
index f18bf77c5..b32609710 100644
--- a/chalk/colorspaces/gray_u8/gray_plugin.h
+++ b/chalk/colorspaces/gray_u8/gray_plugin.h
@@ -29,7 +29,7 @@ class GrayPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    GrayPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    GrayPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~GrayPlugin();
 
 };
diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
index 59b70f777..a913dc496 100644
--- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
+++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
@@ -43,8 +43,8 @@ namespace {
     const TQ_INT32 MAX_CHANNEL_GRAYSCALEA = 2;
 }
 
-KisGrayColorSpace::KisGrayColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisU8BaseColorSpace(KisID("GRAYA", i18n("Grayscale")), TYPE_GRAYA_8, icSigGrayData, tqparent, p)
+KisGrayColorSpace::KisGrayColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisU8BaseColorSpace(KisID("GRAYA", i18n("Grayscale")), TYPE_GRAYA_8, icSigGrayData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Gray"), i18n("G"), 0, KisChannelInfo::COLOR, KisChannelInfo::UINT8));
     m_channels.push_back(new KisChannelInfo(i18n("Alpha"), i18n("A"), 1, KisChannelInfo::ALPHA, KisChannelInfo::UINT8));
@@ -199,7 +199,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 opacity,
                       TQ_INT32 rows,
@@ -208,37 +208,37 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
 {
     switch (op.op()) {
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DARKEN:
-        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_CLEAR: {
         TQ_UINT8 *d;
@@ -253,7 +253,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
     }
         break;
     case COMPOSITE_ALPHA_DARKEN:
-        compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
 
     default:
@@ -285,18 +285,18 @@ void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
             TQ_UINT8 srcAlpha = src[PIXEL_GRAY_ALPHA];
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -353,7 +353,7 @@ void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -362,12 +362,12 @@ void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -419,7 +419,7 @@ void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -428,12 +428,12 @@ void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -490,7 +490,7 @@ void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -499,12 +499,12 @@ void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -561,7 +561,7 @@ void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -570,12 +570,12 @@ void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -632,7 +632,7 @@ void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -641,12 +641,12 @@ void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -703,7 +703,7 @@ void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -712,12 +712,12 @@ void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -775,7 +775,7 @@ void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -784,12 +784,12 @@ void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -846,7 +846,7 @@ void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -855,12 +855,12 @@ void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -927,17 +927,17 @@ void KisGrayColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const TQ_UINT8 *s = src;
         TQ_UINT8 *d = dst;
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (i = cols; i > 0; i--, s+=MAX_CHANNEL_GRAYSCALEA, d+=MAX_CHANNEL_GRAYSCALEA)
         {
             srcAlpha = s[PIXEL_GRAY_ALPHA];
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, *mask);
+                mask++;
             }
             d[PIXEL_GRAY_ALPHA] = UINT8_MULT(srcAlpha, d[PIXEL_GRAY_ALPHA]);
         }
@@ -958,7 +958,7 @@ void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dst
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -966,12 +966,12 @@ void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dst
             TQ_UINT8 srcAlpha = src[PIXEL_GRAY_ALPHA];
             TQ_UINT8 dstAlpha = dst[PIXEL_GRAY_ALPHA];
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (opacity != OPACITY_OPAQUE) {
diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
index a46adcc0b..3f5724794 100644
--- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
+++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
@@ -29,7 +29,7 @@
 
 class KRITACORE_EXPORT KisGrayColorSpace : public KisU8BaseColorSpace {
 public:
-    KisGrayColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisGrayColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisGrayColorSpace();
 
     virtual bool willDegrade(ColorSpaceIndependence /*independence*/)
@@ -70,17 +70,17 @@ public:
     KisCompositeOpList userVisiblecompositeOps() const;
 
 protected:
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
 
 
 private:
@@ -106,7 +106,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigGrayData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisGrayColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisGrayColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "gray built-in - (lcms internal)"; };
 };
diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
index 55054bc6c..ab4642ff1 100644
--- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
+++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
@@ -48,8 +48,8 @@ namespace {
 #define F32_LCMS_TYPE TYPE_BGRA_16
 
 // disable the lcms handling by setting profile=0
-KisLmsF32ColorSpace::KisLmsF32ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile */*p*/) :
-    KisF32BaseColorSpace(KisID("LMSAF32", i18n("LMS (32-bit float/channel)")), F32_LCMS_TYPE, icSig3colorData, tqparent, 0)
+KisLmsF32ColorSpace::KisLmsF32ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile */*p*/) :
+    KisF32BaseColorSpace(KisID("LMSAF32", i18n("LMS (32-bit float/channel)")), F32_LCMS_TYPE, icSig3colorData, parent, 0)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Long"), i18n("L"), PIXEL_LONGWAVE * sizeof(float), KisChannelInfo::COLOR, KisChannelInfo::FLOAT32, sizeof(float)));
     m_channels.push_back(new KisChannelInfo(i18n("Middle"), i18n("M"), PIXEL_MIDDLEWAVE * sizeof(float), KisChannelInfo::COLOR, KisChannelInfo::FLOAT32, sizeof(float)));
@@ -226,21 +226,21 @@ void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
         const float *src = reinterpret_cast<const float *>(srcRowStart);
         float *dst = reinterpret_cast<float *>(dstRowStart);
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             float srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha *= UINT8_TO_FLOAT(U8_tqmask);
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha *= UINT8_TO_FLOAT(U8_mask);
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha > F32_OPACITY_TRANSPARENT + EPSILON) {
@@ -307,20 +307,20 @@ void KisLmsF32ColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             float srcAlpha = s->alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = FLOAT_BLEND(srcAlpha, F32_OPACITY_OPAQUE, UINT8_TO_FLOAT(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = FLOAT_BLEND(srcAlpha, F32_OPACITY_OPAQUE, UINT8_TO_FLOAT(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = srcAlpha * d->alpha;
         }
@@ -348,7 +348,7 @@ void KisLmsF32ColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
@@ -362,13 +362,13 @@ void KisLmsF32ColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     default:
         break;
diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h
index 468ac5e49..1c7666211 100644
--- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h
+++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h
@@ -34,7 +34,7 @@ class KisColorSpaceFactoryRegistry;
 
 class KRITATOOL_EXPORT KisLmsF32ColorSpace : public KisF32BaseColorSpace {
 public:
-    KisLmsF32ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisLmsF32ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisLmsF32ColorSpace();
 
     virtual bool willDegrade(ColorSpaceIndependence independence)
@@ -87,9 +87,9 @@ protected:
                 TQ_INT32 cols,
                 const KisCompositeOp& op);
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
 
 private:
     inline TQ_UINT8 computeRed(float l, float m, float s) const
@@ -148,7 +148,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icMaxEnumData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisLmsF32ColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisLmsF32ColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "sRGB built-in - (lcms internal)"; };
 };
diff --git a/chalk/colorspaces/lms_f32/lms_f32_plugin.cc b/chalk/colorspaces/lms_f32/lms_f32_plugin.cc
index d137c8e82..f7e581ace 100644
--- a/chalk/colorspaces/lms_f32/lms_f32_plugin.cc
+++ b/chalk/colorspaces/lms_f32/lms_f32_plugin.cc
@@ -36,14 +36,14 @@ typedef KGenericFactory<LMSF32Plugin> LMSF32PluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalk_lms_f32_plugin, LMSF32PluginFactory( "chalk" ) )
 
 
-LMSF32Plugin::LMSF32Plugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+LMSF32Plugin::LMSF32Plugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(LMSF32PluginFactory::instance());
 
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-	KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(tqparent);
+	KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(parent);
 
         KisColorSpace * colorSpaceLMSF32  = new KisLmsF32ColorSpace(f, 0);
 
diff --git a/chalk/colorspaces/lms_f32/lms_f32_plugin.h b/chalk/colorspaces/lms_f32/lms_f32_plugin.h
index 7d9229a69..6a2898824 100644
--- a/chalk/colorspaces/lms_f32/lms_f32_plugin.h
+++ b/chalk/colorspaces/lms_f32/lms_f32_plugin.h
@@ -31,7 +31,7 @@ class LMSF32Plugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    LMSF32Plugin(TQObject *tqparent, const char *name, const TQStringList &);
+    LMSF32Plugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~LMSF32Plugin();
 
 };
diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
index 4ae8004b0..9e7f138ef 100644
--- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
+++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
@@ -50,8 +50,8 @@ namespace {
 // FIXME: lcms doesn't support 16-bit float
 #define RGBAF16HALF_LCMS_TYPE TYPE_BGRA_16
 
-KisRgbF16HalfColorSpace::KisRgbF16HalfColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisF16HalfBaseColorSpace(KisID("RGBAF16HALF", i18n("RGB (16-bit float/channel)")), RGBAF16HALF_LCMS_TYPE, icSigRgbData, tqparent, p)
+KisRgbF16HalfColorSpace::KisRgbF16HalfColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisF16HalfBaseColorSpace(KisID("RGBAF16HALF", i18n("RGB (16-bit float/channel)")), RGBAF16HALF_LCMS_TYPE, icSigRgbData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Red"), i18n("R"), PIXEL_RED * sizeof(half), KisChannelInfo::COLOR, KisChannelInfo::FLOAT16, sizeof(half)));
     m_channels.push_back(new KisChannelInfo(i18n("Green"), i18n("G"), PIXEL_GREEN * sizeof(half), KisChannelInfo::COLOR, KisChannelInfo::FLOAT16, sizeof(half)));
@@ -305,21 +305,21 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
 
         const half *src = reinterpret_cast<const half *>(srcRowStart);
         half *dst = reinterpret_cast<half *>(dstRowStart);
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             half srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha *= UINT8_TO_HALF(U8_tqmask);
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha *= UINT8_TO_HALF(U8_mask);
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha > F16HALF_OPACITY_TRANSPARENT + EPSILON) {
@@ -378,7 +378,7 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
         const half *src = reinterpret_cast<const half *>(srcRowStart); \
         half *dst = reinterpret_cast<half *>(dstRowStart); \
         TQ_INT32 columns = numColumns; \
-        const TQ_UINT8 *tqmask = maskRowStart; \
+        const TQ_UINT8 *mask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -387,13 +387,13 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
     \
             srcAlpha = TQMIN(srcAlpha, dstAlpha); \
     \
-            if (tqmask != 0) { \
-                TQ_UINT8 U8_tqmask = *tqmask; \
+            if (mask != 0) { \
+                TQ_UINT8 U8_mask = *mask; \
     \
-                if (U8_tqmask != OPACITY_OPAQUE) { \
-                    srcAlpha *= UINT8_TO_HALF(U8_tqmask); \
+                if (U8_mask != OPACITY_OPAQUE) { \
+                    srcAlpha *= UINT8_TO_HALF(U8_mask); \
                 } \
-                tqmask++; \
+                mask++; \
             } \
     \
             if (srcAlpha > F16HALF_OPACITY_TRANSPARENT + EPSILON) { \
@@ -761,20 +761,20 @@ void KisRgbF16HalfColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             half srcAlpha = s->alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = HALF_BLEND(srcAlpha, F16HALF_OPACITY_OPAQUE, UINT8_TO_HALF(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = HALF_BLEND(srcAlpha, F16HALF_OPACITY_OPAQUE, UINT8_TO_HALF(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = srcAlpha * d->alpha;
         }
@@ -791,7 +791,7 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
@@ -805,7 +805,7 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_IN:
         //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -834,16 +834,16 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BUMPMAP:
         //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity);
         break;
     case COMPOSITE_COPY_RED:
         //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -878,22 +878,22 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
         // No composition.
         break;
     case COMPOSITE_DARKEN:
-        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLORIZE:
         //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -902,24 +902,24 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ALPHA_DARKEN:
         abstractCompositeAlphaDarken<half, F16HalfMult, Uint8ToF16Half, F16HalfOpacityTest,
                     PIXEL_ALPHA, MAX_CHANNEL_RGB, MAX_CHANNEL_RGBA>(
-                    dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
+                    dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
                     rows, cols,
                     U8_opacity, F16HalfMult(), Uint8ToF16Half(), F16HalfOpacityTest());
         break;
diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
index f965a7660..a8fde30d6 100644
--- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
+++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
@@ -31,7 +31,7 @@
 
 class KRITATOOL_EXPORT KisRgbF16HalfColorSpace : public KisF16HalfBaseColorSpace {
 public:
-    KisRgbF16HalfColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisRgbF16HalfColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisRgbF16HalfColorSpace();
 
     virtual bool willDegrade(ColorSpaceIndependence independence)
@@ -85,20 +85,20 @@ protected:
                 TQ_INT32 cols,
                 const KisCompositeOp& op);
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity);
 
 private:
     friend class KisRgbF16HalfColorSpaceTester;
@@ -135,7 +135,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisRgbF16HalfColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisRgbF16HalfColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "sRGB built-in - (lcms internal)"; };
 };
diff --git a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc
index f50672b9d..3f2b6a85f 100644
--- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc
+++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc
@@ -35,14 +35,14 @@ typedef KGenericFactory<RGBF16HalfPlugin> RGBF16HalfPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalk_rgb_f16half_plugin, RGBF16HalfPluginFactory( "chalk" ) )
 
 
-RGBF16HalfPlugin::RGBF16HalfPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+RGBF16HalfPlugin::RGBF16HalfPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(RGBF16HalfPluginFactory::instance());
 
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
 
         KisColorSpace * colorSpaceRGBF16Half  = new KisRgbF16HalfColorSpace(f, 0);
         KisColorSpaceFactory *csf  = new KisRgbF16HalfColorSpaceFactory();
diff --git a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h
index a970247c2..d188f7ba8 100644
--- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h
+++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h
@@ -30,7 +30,7 @@ class RGBF16HalfPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    RGBF16HalfPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    RGBF16HalfPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~RGBF16HalfPlugin();
 
 };
diff --git a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc
index 59eb8e5f1..f5e39f84e 100644
--- a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc
+++ b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc
@@ -537,7 +537,7 @@ void  KisRgbF16HalfColorSpaceTester::testCompositeOps()
     };
 
     cs->compositeOver(reinterpret_cast<TQ_UINT8 *>(dstPixels), DST_ROW_STRIDE, reinterpret_cast<const TQ_UINT8 *>(srcPixels),
-                SRC_ROW_STRIDE, tqmask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity);
+                SRC_ROW_STRIDE, mask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity);
     */
 
     delete cs;
diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
index 1edd63f9f..86494de73 100644
--- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
+++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
@@ -52,8 +52,8 @@ namespace {
 #define F32_LCMS_TYPE TYPE_BGRA_16
 
 // disable the lcms handling by setting profile=0
-KisRgbF32ColorSpace::KisRgbF32ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile */*p*/) :
-    KisF32BaseColorSpace(KisID("RGBAF32", i18n("RGB (32-bit float/channel)")), F32_LCMS_TYPE, icSigRgbData, tqparent, 0)
+KisRgbF32ColorSpace::KisRgbF32ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile */*p*/) :
+    KisF32BaseColorSpace(KisID("RGBAF32", i18n("RGB (32-bit float/channel)")), F32_LCMS_TYPE, icSigRgbData, parent, 0)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Red"), i18n("R"), PIXEL_RED * sizeof(float), KisChannelInfo::COLOR, KisChannelInfo::FLOAT32, sizeof(float)));
     m_channels.push_back(new KisChannelInfo(i18n("Green"), i18n("G"), PIXEL_GREEN * sizeof(float), KisChannelInfo::COLOR, KisChannelInfo::FLOAT32, sizeof(float)));
@@ -304,21 +304,21 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
         const float *src = reinterpret_cast<const float *>(srcRowStart);
         float *dst = reinterpret_cast<float *>(dstRowStart);
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             float srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha *= UINT8_TO_FLOAT(U8_tqmask);
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha *= UINT8_TO_FLOAT(U8_mask);
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha > F32_OPACITY_TRANSPARENT + EPSILON) {
@@ -377,7 +377,7 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         const float *src = reinterpret_cast<const float *>(srcRowStart); \
         float *dst = reinterpret_cast<float *>(dstRowStart); \
         TQ_INT32 columns = numColumns; \
-        const TQ_UINT8 *tqmask = maskRowStart; \
+        const TQ_UINT8 *mask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -386,13 +386,13 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
     \
             srcAlpha = TQMIN(srcAlpha, dstAlpha); \
     \
-            if (tqmask != 0) { \
-                TQ_UINT8 U8_tqmask = *tqmask; \
+            if (mask != 0) { \
+                TQ_UINT8 U8_mask = *mask; \
     \
-                if (U8_tqmask != OPACITY_OPAQUE) { \
-                    srcAlpha *= UINT8_TO_FLOAT(U8_tqmask); \
+                if (U8_mask != OPACITY_OPAQUE) { \
+                    srcAlpha *= UINT8_TO_FLOAT(U8_mask); \
                 } \
-                tqmask++; \
+                mask++; \
             } \
     \
             if (srcAlpha > F32_OPACITY_TRANSPARENT + EPSILON) { \
@@ -760,20 +760,20 @@ void KisRgbF32ColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             float srcAlpha = s->alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = FLOAT_BLEND(srcAlpha, F32_OPACITY_OPAQUE, UINT8_TO_FLOAT(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = FLOAT_BLEND(srcAlpha, F32_OPACITY_OPAQUE, UINT8_TO_FLOAT(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = srcAlpha * d->alpha;
         }
@@ -790,7 +790,7 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
@@ -804,7 +804,7 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_IN:
         //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -833,16 +833,16 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BUMPMAP:
         //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity);
         break;
     case COMPOSITE_COPY_RED:
         //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -877,22 +877,22 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
         // No composition.
         break;
     case COMPOSITE_DARKEN:
-        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLORIZE:
         //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -901,24 +901,24 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ALPHA_DARKEN:
         abstractCompositeAlphaDarken<float, F32Mult, Uint8ToF32, F32OpacityTest,
                     PIXEL_ALPHA, MAX_CHANNEL_RGB, MAX_CHANNEL_RGBA>(
-                    dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
+                    dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
                     rows, cols, U8_opacity, F32Mult(), Uint8ToF32(), F32OpacityTest());
     default:
         break;
diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
index cfd930106..050c2ae5f 100644
--- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
+++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
@@ -33,7 +33,7 @@ class KisColorSpaceFactoryRegistry;
 
 class KRITATOOL_EXPORT KisRgbF32ColorSpace : public KisF32BaseColorSpace {
 public:
-    KisRgbF32ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisRgbF32ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisRgbF32ColorSpace();
 
     virtual bool willDegrade(ColorSpaceIndependence independence)
@@ -89,20 +89,20 @@ protected:
                 TQ_INT32 cols,
                 const KisCompositeOp& op);
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity);
 
 private:
     friend class KisRgbF32ColorSpaceTester;
@@ -156,7 +156,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisRgbF32ColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisRgbF32ColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "sRGB built-in - (lcms internal)"; };
 };
diff --git a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc
index 4e11e36c6..7c1149711 100644
--- a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc
+++ b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc
@@ -35,14 +35,14 @@ typedef KGenericFactory<RGBF32Plugin> RGBF32PluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalk_rgb_f32_plugin, RGBF32PluginFactory( "chalk" ) )
 
 
-RGBF32Plugin::RGBF32Plugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+RGBF32Plugin::RGBF32Plugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(RGBF32PluginFactory::instance());
 
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-	KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(tqparent);
+	KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(parent);
 
         KisColorSpace * colorSpaceRGBF32  = new KisRgbF32ColorSpace(f, 0);
 
diff --git a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h
index 22ec674f1..75ae708ab 100644
--- a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h
+++ b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h
@@ -30,7 +30,7 @@ class RGBF32Plugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    RGBF32Plugin(TQObject *tqparent, const char *name, const TQStringList &);
+    RGBF32Plugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~RGBF32Plugin();
 
 };
diff --git a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc
index b4ec34e9b..eb9f9637b 100644
--- a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc
+++ b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc
@@ -533,7 +533,7 @@ void KisRgbF32ColorSpaceTester::testCompositeOps()
     };
 
     cs->compositeOver(reinterpret_cast<TQ_UINT8 *>(dstPixels), DST_ROW_STRIDE, reinterpret_cast<const TQ_UINT8 *>(srcPixels),
-                SRC_ROW_STRIDE, tqmask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity);
+                SRC_ROW_STRIDE, mask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity);
     */
 
     delete cs;
diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
index f792e8757..c3307aefe 100644
--- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
+++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
@@ -44,8 +44,8 @@ namespace {
 //const TQ_UINT16 KisRgbU16ColorSpace::U16_OPACITY_OPAQUE;
 //const TQ_UINT16 KisRgbU16ColorSpace::U16_OPACITY_TRANSPARENT;
 
-KisRgbU16ColorSpace::KisRgbU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisU16BaseColorSpace(KisID("RGBA16", i18n("RGB (16-bit integer/channel)")), TYPE_BGRA_16, icSigRgbData, tqparent, p)
+KisRgbU16ColorSpace::KisRgbU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisU16BaseColorSpace(KisID("RGBA16", i18n("RGB (16-bit integer/channel)")), TYPE_BGRA_16, icSigRgbData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Red"), i18n("R"), PIXEL_RED * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQColor(255,0,0)));
     m_channels.push_back(new KisChannelInfo(i18n("Green"), i18n("G"), PIXEL_GREEN * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQColor(0,255,0)));
@@ -202,21 +202,21 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT16 srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha != U16_OPACITY_TRANSPARENT) {
@@ -275,7 +275,7 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \
         TQ_INT32 columns = numColumns; \
-        const TQ_UINT8 *tqmask = maskRowStart; \
+        const TQ_UINT8 *mask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -284,13 +284,13 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
     \
             srcAlpha = TQMIN(srcAlpha, dstAlpha); \
     \
-            if (tqmask != 0) { \
-                TQ_UINT8 U8_tqmask = *tqmask; \
+            if (mask != 0) { \
+                TQ_UINT8 U8_mask = *mask; \
     \
-                if (U8_tqmask != OPACITY_OPAQUE) { \
-                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); \
+                if (U8_mask != OPACITY_OPAQUE) { \
+                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); \
                 } \
-                tqmask++; \
+                mask++; \
             } \
     \
             if (srcAlpha != U16_OPACITY_TRANSPARENT) { \
@@ -680,20 +680,20 @@ void KisRgbU16ColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             TQ_UINT16 srcAlpha = s->alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = UINT16_MULT(srcAlpha, d->alpha);
         }
@@ -710,7 +710,7 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
@@ -724,7 +724,7 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_IN:
         //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -753,16 +753,16 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BUMPMAP:
         //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity);
         break;
     case COMPOSITE_COPY_RED:
         //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -797,22 +797,22 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         // No composition.
         break;
     case COMPOSITE_DARKEN:
-        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLORIZE:
         //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -821,24 +821,24 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ALPHA_DARKEN:
         abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
                     PIXEL_ALPHA, MAX_CHANNEL_RGB, MAX_CHANNEL_RGBA>(
-                    dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
+                    dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
                     rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
                     break;
     default:
diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h
index 5994921a5..fde72fea2 100644
--- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h
+++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h
@@ -38,7 +38,7 @@ public:
         TQ_UINT16 alpha;
     };
 public:
-    KisRgbU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisRgbU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisRgbU16ColorSpace();
 
     virtual bool willDegrade(ColorSpaceIndependence independence)
@@ -80,20 +80,20 @@ protected:
                 TQ_INT32 cols,
                 const KisCompositeOp& op);
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
 
 private:
     friend class KisRgbU16ColorSpaceTester;
@@ -120,7 +120,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisRgbU16ColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisRgbU16ColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "sRGB built-in - (lcms internal)"; };
 };
diff --git a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc
index 828298c34..bc362a83e 100644
--- a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc
+++ b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc
@@ -34,14 +34,14 @@ typedef KGenericFactory<RGBU16Plugin> RGBU16PluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalk_rgb_u16_plugin, RGBU16PluginFactory( "chalk" ) )
 
 
-RGBU16Plugin::RGBU16Plugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+RGBU16Plugin::RGBU16Plugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(RGBU16PluginFactory::instance());
 
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry *>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry *>( parent );
 
         KisColorSpace * colorSpaceRGBU16 = new KisRgbU16ColorSpace(f, 0);
         KisColorSpaceFactory * csFactory = new KisRgbU16ColorSpaceFactory();
diff --git a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h
index d5cf4d140..4373a2050 100644
--- a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h
+++ b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h
@@ -29,7 +29,7 @@ class RGBU16Plugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    RGBU16Plugin(TQObject *tqparent, const char *name, const TQStringList &);
+    RGBU16Plugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~RGBU16Plugin();
 };
 
diff --git a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc
index 7861b8e1a..e260b4d51 100644
--- a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc
+++ b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc
@@ -516,7 +516,7 @@ void  KisRgbU16ColorSpaceTester::testCompositeOps()
     };
 
     cs->compositeOver(reinterpret_cast<TQ_UINT8 *>(dstPixels), DST_ROW_STRIDE, reinterpret_cast<const TQ_UINT8 *>(srcPixels),
-                SRC_ROW_STRIDE, tqmask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity);
+                SRC_ROW_STRIDE, mask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity);
     */
 
     delete cs;
diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
index e4e181ca7..f15227982 100644
--- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
+++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
@@ -44,8 +44,8 @@ namespace {
     const TQ_INT32 MAX_CHANNEL_RGBA = 4;
 }
 
-KisRgbColorSpace::KisRgbColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisU8BaseColorSpace(KisID("RGBA", i18n("RGB (8-bit integer/channel)")), TYPE_BGRA_8, icSigRgbData, tqparent, p)
+KisRgbColorSpace::KisRgbColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisU8BaseColorSpace(KisID("RGBA", i18n("RGB (8-bit integer/channel)")), TYPE_BGRA_8, icSigRgbData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Red"), i18n("R"), 2, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, TQColor(255,0,0)));
     m_channels.push_back(new KisChannelInfo(i18n("Green"), i18n("G"), 1, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, TQColor(0,255,0)));
@@ -272,19 +272,19 @@ void KisRgbColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT8 srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -346,7 +346,7 @@ void KisRgbColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -354,12 +354,12 @@ void KisRgbColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
             TQ_UINT8 srcAlpha = src[PIXEL_ALPHA];
             TQ_UINT8 dstAlpha = dst[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (opacity != OPACITY_OPAQUE) {
@@ -392,7 +392,7 @@ void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -401,12 +401,12 @@ void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
 
@@ -473,7 +473,7 @@ void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -482,12 +482,12 @@ void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -544,7 +544,7 @@ void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -553,12 +553,12 @@ void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -615,7 +615,7 @@ void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -624,12 +624,12 @@ void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
 
@@ -687,7 +687,7 @@ void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -696,12 +696,12 @@ void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
 
@@ -759,7 +759,7 @@ void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -768,12 +768,12 @@ void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -831,7 +831,7 @@ void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -840,12 +840,12 @@ void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -902,7 +902,7 @@ void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -911,12 +911,12 @@ void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -973,7 +973,7 @@ void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -982,12 +982,12 @@ void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -1056,7 +1056,7 @@ void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -1065,12 +1065,12 @@ void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -1139,7 +1139,7 @@ void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -1148,12 +1148,12 @@ void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -1222,7 +1222,7 @@ void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -1231,12 +1231,12 @@ void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -1315,17 +1315,17 @@ void KisRgbColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const TQ_UINT8 *s = src;
         TQ_UINT8 *d = dst;
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (i = cols; i > 0; i--, s+=MAX_CHANNEL_RGBA, d+=MAX_CHANNEL_RGBA)
         {
             srcAlpha = s[PIXEL_ALPHA];
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, *mask);
+                mask++;
             }
             d[PIXEL_ALPHA] = UINT8_MULT(srcAlpha, d[PIXEL_ALPHA]);
         }
@@ -1341,7 +1341,7 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 opacity,
                       TQ_INT32 rows,
@@ -1354,10 +1354,10 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ALPHA_DARKEN:
-        compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_IN:
         compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -1387,16 +1387,16 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
         compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BUMPMAP:
         compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY_RED:
         compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -1431,22 +1431,22 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
         // No composition.
         break;
     case COMPOSITE_DARKEN:
-        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLORIZE:
         compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -1455,19 +1455,19 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
         compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     default:
         break;
diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h
index 77628c31d..8fdfb355c 100644
--- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h
+++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h
@@ -31,7 +31,7 @@ const TQ_UINT8 PIXEL_ALPHA = 3;
 
 class KRITATOOL_EXPORT KisRgbColorSpace : public KisU8BaseColorSpace {
 public:
-    KisRgbColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisRgbColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisRgbColorSpace();
 
     virtual bool willDegrade(ColorSpaceIndependence)
@@ -75,21 +75,21 @@ protected:
                 TQ_INT32 cols,
                 const KisCompositeOp& op);
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
 };
 
 class KisRgbColorSpaceFactory : public KisColorSpaceFactory
@@ -108,7 +108,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile * p) { return new KisRgbColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile * p) { return new KisRgbColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "sRGB built-in - (lcms internal)"; };
 };
diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.cc b/chalk/colorspaces/rgb_u8/rgb_plugin.cc
index 0794456e2..f987e33f6 100644
--- a/chalk/colorspaces/rgb_u8/rgb_plugin.cc
+++ b/chalk/colorspaces/rgb_u8/rgb_plugin.cc
@@ -43,14 +43,14 @@ typedef KGenericFactory<RGBPlugin> RGBPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkrgbplugin, RGBPluginFactory( "chalk" ) )
 
 
-RGBPlugin::RGBPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+RGBPlugin::RGBPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(RGBPluginFactory::instance());
 
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-	KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(tqparent);
+	KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(parent);
 
         KisProfile *defProfile = new KisProfile(cmsCreate_sRGBProfile());
         f->addProfile(defProfile);
diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.h b/chalk/colorspaces/rgb_u8/rgb_plugin.h
index 08ccd8908..a3408c782 100644
--- a/chalk/colorspaces/rgb_u8/rgb_plugin.h
+++ b/chalk/colorspaces/rgb_u8/rgb_plugin.h
@@ -29,7 +29,7 @@ class RGBPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    RGBPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    RGBPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~RGBPlugin();
 
 };
diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cc
index 7d8d84abc..dbb6c3f9c 100644
--- a/chalk/colorspaces/wet/kis_wet_colorspace.cc
+++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc
@@ -109,8 +109,8 @@ int getH(int r, int g, int b)
     return h;
 }
 
-KisWetColorSpace::KisWetColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisAbstractColorSpace(KisID("WET", i18n("Watercolors")), 0, icMaxEnumData, tqparent, p)
+KisWetColorSpace::KisWetColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisAbstractColorSpace(KisID("WET", i18n("Watercolors")), 0, icMaxEnumData, parent, p)
 {
     wet_init_render_tab();
 
diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.h b/chalk/colorspaces/wet/kis_wet_colorspace.h
index 25af68fde..dddbcf029 100644
--- a/chalk/colorspaces/wet/kis_wet_colorspace.h
+++ b/chalk/colorspaces/wet/kis_wet_colorspace.h
@@ -92,7 +92,7 @@ void wetPixFromDouble(WetPix * dst, WetPixDbl *src);
 
 class KisWetColorSpace : public KisAbstractColorSpace {
 public:
-    KisWetColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisWetColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisWetColorSpace();
 
 
@@ -211,7 +211,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icMaxEnumData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisWetColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisWetColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return ""; };
 };
diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc
index eb6556d27..901f29093 100644
--- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc
+++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc
@@ -46,7 +46,7 @@
 #include "kis_wet_colorspace.h"
 #include "kis_wet_palette_widget.h"
 
-KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *tqparent, const char *name) : super(tqparent, name)
+KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_subject = 0;
 
diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.h b/chalk/colorspaces/wet/kis_wet_palette_widget.h
index 10c177e6a..60fd28e03 100644
--- a/chalk/colorspaces/wet/kis_wet_palette_widget.h
+++ b/chalk/colorspaces/wet/kis_wet_palette_widget.h
@@ -45,7 +45,7 @@ class KRITAUI_EXPORT KisWetPaletteWidget
     typedef TQWidget super;
 
 public:
-    KisWetPaletteWidget(TQWidget *tqparent = 0L, const char *name = 0);
+    KisWetPaletteWidget(TQWidget *parent = 0L, const char *name = 0);
     virtual ~KisWetPaletteWidget() {}
 
 protected slots:
diff --git a/chalk/colorspaces/wet/kis_wetop.cc b/chalk/colorspaces/wet/kis_wetop.cc
index 55f466faa..900fd7219 100644
--- a/chalk/colorspaces/wet/kis_wetop.cc
+++ b/chalk/colorspaces/wet/kis_wetop.cc
@@ -36,10 +36,10 @@
 #include "kis_wetop.h"
 #include "kis_wet_colorspace.h"
 
-KisWetOpSettings::KisWetOpSettings(TQWidget *tqparent)
-    : super(tqparent)
+KisWetOpSettings::KisWetOpSettings(TQWidget *parent)
+    : super(parent)
 {
-    m_options = new WetPaintOptions(tqparent, "wet option widget");
+    m_options = new WetPaintOptions(parent, "wet option widget");
 }
 
 bool KisWetOpSettings::varySize() const
@@ -67,13 +67,13 @@ KisPaintOp * KisWetOpFactory::createOp(const KisPaintOpSettings *settings, KisPa
     return op;
 }
 
-KisPaintOpSettings* KisWetOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice)
+KisPaintOpSettings* KisWetOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice)
 {
     if (inputDevice == KisInputDevice::mouse()) {
         // No options for mouse, only tablet devices
         return 0;
     } else {
-        return new KisWetOpSettings(tqparent);
+        return new KisWetOpSettings(parent);
     }
 }
 
@@ -120,8 +120,8 @@ void KisWetOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
         dab = brush->image(KisMetaRegistry::instance()->csRegistry()->getAlpha8(), inf);
     }
     else {
-        KisAlphaMaskSP tqmask = brush->tqmask(inf);
-        dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
+        KisAlphaMaskSP mask = brush->mask(inf);
+        dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
     }
 
     KisColorSpace * cs = device->colorSpace();
diff --git a/chalk/colorspaces/wet/kis_wetop.h b/chalk/colorspaces/wet/kis_wetop.h
index 37cd594aa..85224f29b 100644
--- a/chalk/colorspaces/wet/kis_wetop.h
+++ b/chalk/colorspaces/wet/kis_wetop.h
@@ -36,13 +36,13 @@ public:
     virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter);
     virtual KisID id() { return KisID("wetbrush", i18n("Watercolor Brush")); }
     virtual bool userVisible(KisColorSpace* cs) { return cs->id() == KisID("WET", ""); }
-    virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice);
+    virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice);
 };
 
 class KisWetOpSettings : public KisPaintOpSettings {
     typedef KisPaintOpSettings super;
 public:
-    KisWetOpSettings(TQWidget *tqparent);
+    KisWetOpSettings(TQWidget *parent);
 
     bool varySize() const;
     bool varyWetness() const;
diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc
index 1f65b83c9..df0666c4e 100644
--- a/chalk/colorspaces/wet/wet_plugin.cc
+++ b/chalk/colorspaces/wet/wet_plugin.cc
@@ -66,14 +66,14 @@ typedef KGenericFactory<WetPlugin> WetPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkwetplugin, WetPluginFactory( "chalkcore" ) )
 
 
-WetPlugin::WetPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+WetPlugin::WetPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(WetPluginFactory::instance());
 
     // This is not a gui plugin; only load it when the doc is created.
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(tqparent);
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") ) {
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(parent);
 
         KisColorSpace* colorSpaceWet = new KisWetColorSpace(f, 0);
 
@@ -97,12 +97,12 @@ WetPlugin::WetPlugin(TQObject *tqparent, const char *name, const TQStringList &)
         // Texture Action:
         f->addPaintDeviceAction(colorSpaceWet, new WetPaintDevAction);
     }
-    else if (tqparent->inherits("KisView"))
+    else if (parent->inherits("KisView"))
     {
         setInstance(WetPluginFactory::instance());
         setXMLFile(locate("data","chalkplugins/wetplugin.rc"), true);
 
-        m_view = dynamic_cast<KisView*>(tqparent);
+        m_view = dynamic_cast<KisView*>(parent);
         // Wetness visualisation
         WetnessVisualisationFilter * wf = new WetnessVisualisationFilter(m_view);
         wf->setAction(new KToggleAction(i18n("Wetness Visualisation"), 0, 0, wf,
diff --git a/chalk/colorspaces/wet/wet_plugin.h b/chalk/colorspaces/wet/wet_plugin.h
index d2fdc0837..fa3bed064 100644
--- a/chalk/colorspaces/wet/wet_plugin.h
+++ b/chalk/colorspaces/wet/wet_plugin.h
@@ -34,7 +34,7 @@ class WetPlugin : public KParts::Plugin
      Q_OBJECT
   TQ_OBJECT
 public:
-    WetPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    WetPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~WetPlugin();
 
 private:
diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cc
index 11aaeb04e..5d789cf14 100644
--- a/chalk/colorspaces/wet/wetphysicsfilter.cc
+++ b/chalk/colorspaces/wet/wetphysicsfilter.cc
@@ -43,7 +43,7 @@
  * [11:16] <CyrilleB> boud: which one then ?
  * [11:16] <pippin> the error is distributed to the neighbour pixels (to the right, down and down to the left in pixels which have not yet been processed
  * [11:16] <pippin> )
- * [11:16] <boud> CyrilleB: it's only aptqparent when you let something dry for some time, it looks like meandering snakes (like the old game "snake")
+ * [11:16] <boud> CyrilleB: it's only apparent when you let something dry for some time, it looks like meandering snakes (like the old game "snake")
  * [11:16] <CyrilleB> pippin: somehow yes
  * [11:16] <boud> pippin: that is possible
  * [11:17] <pippin> boud: this leads to "bleeding" of data to the right and down,..
@@ -55,7 +55,7 @@
  * [11:27] <boud> Well, I don't have time to investigate right now, but it sounds very plausible.
  * [11:27] <CyrilleB> pippin: :)
  * [11:28] <boud> of course, the code _is_ available :-)
- * [11:28] <pippin> if there is some form of diffusion matrix that is directional around the current pixel,. having that tqmask rotate depending on the modulus of the current iteration # should cancel such an effect out
+ * [11:28] <pippin> if there is some form of diffusion matrix that is directional around the current pixel,. having that mask rotate depending on the modulus of the current iteration # should cancel such an effect out
  */
 WetPhysicsFilter::WetPhysicsFilter()
     : KisFilter(id(), "artistic", i18n("Dry the Paint"))
diff --git a/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc b/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc
index abcf2cec0..d1616bd61 100644
--- a/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc
+++ b/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc
@@ -52,13 +52,13 @@ void KisWSBrushOp::paintAt(const KisPoint &pos,
 {
     // Painting should be implemented according to the following algorithm:
     // retrieve brush
-    // if brush == tqmask
-    //          retrieve tqmask
+    // if brush == mask
+    //          retrieve mask
     // else if brush == image
     //          retrieve image
-    // subsample (tqmask | image) for position -- pos should be double!
-    // apply filters to tqmask (colour | gradient | pattern | etc.
-    // composite filtered tqmask into temporary layer
+    // subsample (mask | image) for position -- pos should be double!
+    // apply filters to mask (colour | gradient | pattern | etc.
+    // composite filtered mask into temporary layer
     // composite temporary layer into target layer
     // @see: doc/brush.txt
 
@@ -91,8 +91,8 @@ void KisWSBrushOp::paintAt(const KisPoint &pos,
         dab = brush -> image(device -> colorSpace(), pressure, xFraction, yFraction);
     }
     else {
-        KisAlphaMaskSP tqmask = brush -> tqmask(pressure, xFraction, yFraction);
-        dab = computeDab(tqmask);
+        KisAlphaMaskSP mask = brush -> mask(pressure, xFraction, yFraction);
+        dab = computeDab(mask);
     }
     m_painter -> setPressure(pressure);
 
diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc
index 383bd9c54..b3e1ffa60 100644
--- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc
+++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc
@@ -36,13 +36,13 @@ typedef KGenericFactory<WSBrushPaintOpPlugin> WSBrushPaintOpPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkwsbrushpaintop, WSBrushPaintOpPluginFactory( "chalkcore" ) )
 
 
-WSBrushPaintOpPlugin::WSBrushPaintOpPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+WSBrushPaintOpPlugin::WSBrushPaintOpPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(WSBrushPaintOpPluginFactory::instance());
 
     // This is not a gui plugin; only load it when the doc is created.
-    if ( tqparent->inherits("KisFactory") )
+    if ( parent->inherits("KisFactory") )
     {
         KisPaintOpRegistry::instance() -> add ( new KisWSBrushOpFactory );
     }
diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h
index 7e77afec1..59d4ef153 100644
--- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h
+++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h
@@ -33,7 +33,7 @@ class WSBrushPaintOpPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    WSBrushPaintOpPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    WSBrushPaintOpPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~WSBrushPaintOpPlugin();
 
 private:
diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
index b1e1ec825..22badb9c4 100644
--- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
+++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
@@ -356,7 +356,7 @@ void KisWetStickyColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 opacity,
                       TQ_INT32 rows,
@@ -368,11 +368,11 @@ void KisWetStickyColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
     default:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     }
 
@@ -389,7 +389,7 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         TQ_INT32 columns = numColumns;
 
@@ -410,12 +410,12 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
 
             TQ_UINT8 srcAlpha = srcCell->alpha;
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -467,7 +467,7 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
 
 }
 
-void KisWetStickyColorSpace::compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity)
+void KisWetStickyColorSpace::compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity)
 {
     TQ_INT32 linesize = sizeof(CELL) * columns;
     TQ_UINT8 *d;
diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h
index 9ff6452b7..b9030039f 100644
--- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h
+++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h
@@ -139,9 +139,9 @@ protected:
 
 private:
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeClear(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeClear(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
 
 };
 
diff --git a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc
index 040d30023..192e8517d 100644
--- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc
+++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc
@@ -153,9 +153,9 @@ void KisWSEngineFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisF
 
 }
 
-KisFilterConfigWidget * KisWSEngineFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev)
+KisFilterConfigWidget * KisWSEngineFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev)
 {
-//     KisWSEngineFilterConfigurationWidget* kefcw = new KisWSEngineFilterConfigurationWidget(this,tqparent, "");
+//     KisWSEngineFilterConfigurationWidget* kefcw = new KisWSEngineFilterConfigurationWidget(this,parent, "");
 //     kdDebug(DBG_AREA_FILTERS) << kefcw << endl;
 //     return kefcw  ;
     return 0;
diff --git a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.h b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.h
index d1c23810c..e15998a06 100644
--- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.h
+++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.h
@@ -59,7 +59,7 @@ public:
     virtual bool supportsIncrementalPainting() { return false; }
 
 public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration* configuration(TQWidget*, KisPaintDeviceSP dev);
 
 
diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc
index 525b18bb5..a5c12811e 100644
--- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc
+++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc
@@ -37,13 +37,13 @@ typedef KGenericFactory<WetStickyPlugin> WetStickyPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkwsplugin, WetStickyPluginFactory( "chalkcore" ) )
 
 
-WetStickyPlugin::WetStickyPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+WetStickyPlugin::WetStickyPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
            setInstance(WetStickyPluginFactory::instance());
 
     // This is not a gui plugin; only load it when the doc is created.
-    if ( tqparent->inherits("KisFactory") )
+    if ( parent->inherits("KisFactory") )
     {
         KisColorSpace * colorSpaceWS = new KisWetStickyColorSpace();
         Q_CHECK_PTR(colorSpaceWS);
diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.h b/chalk/colorspaces/wetsticky/wet_sticky_plugin.h
index fe981a59b..e6749e7f9 100644
--- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.h
+++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.h
@@ -34,7 +34,7 @@ class WetStickyPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    WetStickyPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    WetStickyPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~WetStickyPlugin();
 
 };
diff --git a/chalk/colorspaces/wetsticky/ws/anim.c b/chalk/colorspaces/wetsticky/ws/anim.c
index 995a3dffc..fed5379f5 100644
--- a/chalk/colorspaces/wetsticky/ws/anim.c
+++ b/chalk/colorspaces/wetsticky/ws/anim.c
@@ -53,7 +53,7 @@ static Pixmap    colour_pm[FRAME_LIMIT];
 
 static GC gc;
 static GC tmp_gc;
-static long tqmask;
+static long mask;
 static XGCValues values;
 
 Display *display;
@@ -117,14 +117,14 @@ char *argv[];
 
 	XSynchronize(display, True);
 
-	tqmask = GCBackground| GCForeground|  GCFunction;
+	mask = GCBackground| GCForeground|  GCFunction;
 
         values.function = GXcopy;
         values.background = 0;
         values.foreground = 1;
 
 
-        gc = XtGetGC(colour_canvas, tqmask, &values);
+        gc = XtGetGC(colour_canvas, mask, &values);
 
 	
 
diff --git a/chalk/colorspaces/wetsticky/ws/cmap.c b/chalk/colorspaces/wetsticky/ws/cmap.c
index 0f11eaf7a..9e53b0aef 100644
--- a/chalk/colorspaces/wetsticky/ws/cmap.c
+++ b/chalk/colorspaces/wetsticky/ws/cmap.c
@@ -59,7 +59,7 @@ static Pixmap		        dryness_pm;
 
 static GC gc;
 static GC tmp_gc;
-static long tqmask;
+static long mask;
 static XGCValues values;
 
 static Colormap cmap;
@@ -216,7 +216,7 @@ Drawable win;
 /* Fill a window with a solid, white rectangle */
 {
 XGCValues values;
-long tqmask;
+long mask;
 
 	values.background = colours[0].pixel;
         values.foreground = colours[255].pixel;;
@@ -224,9 +224,9 @@ long tqmask;
         values.function   = GXclear;
 
 
-         tqmask = GCBackground| GCForeground| GCFillStyle | GCFunction;
+         mask = GCBackground| GCForeground| GCFillStyle | GCFunction;
 
-         tmp_gc = XtGetGC(top_level,  tqmask, &values);
+         tmp_gc = XtGetGC(top_level,  mask, &values);
 
         XFillRectangle(XtDisplay(top_level), win, tmp_gc, 0,  0, 300, 300);
 
@@ -371,14 +371,14 @@ int height;
 
         XInstallColormap(display, cmap);
 
-	tqmask = GCBackground| GCForeground|  GCFunction; 
+	mask = GCBackground| GCForeground|  GCFunction; 
 
 	values.function = GXcopy;
 	values.background = colours[0].pixel;
 	values.foreground = colours[255].pixel;
 
 
-	gc = XtGetGC(colour_canvas, tqmask, &values);
+	gc = XtGetGC(colour_canvas, mask, &values);
 
 	colour_pm = XCreatePixmap(XtDisplay(top_level), 
 			XtWindow(colour_shell), width, height,
diff --git a/chalk/colorspaces/wetsticky/ws/x_interface.c b/chalk/colorspaces/wetsticky/ws/x_interface.c
index a8b54b3ea..7c36a303b 100644
--- a/chalk/colorspaces/wetsticky/ws/x_interface.c
+++ b/chalk/colorspaces/wetsticky/ws/x_interface.c
@@ -68,7 +68,7 @@ static Pixmap		        dryness_pm;
 
 static GC gc;
 static GC tmp_gc;
-static long tqmask;
+static long mask;
 static XGCValues values;
 
 static Colormap cmap;
@@ -272,7 +272,7 @@ Drawable win;
 /* Fill a window with a solid, white rectangle */
 {
 XGCValues values;
-long tqmask;
+long mask;
 
 	values.background = colours[0].pixel;
         values.foreground = colours[255].pixel;;
@@ -280,9 +280,9 @@ long tqmask;
         values.function   = GXclear;
 
 
-         tqmask = GCBackground| GCForeground| GCFillStyle | GCFunction;
+         mask = GCBackground| GCForeground| GCFillStyle | GCFunction;
 
-         tmp_gc = XtGetGC(top_level,  tqmask, &values);
+         tmp_gc = XtGetGC(top_level,  mask, &values);
 
         XFillRectangle(XtDisplay(top_level), win, tmp_gc, 0,  0, 300, 300);
 
@@ -423,14 +423,14 @@ int height;
 
         XInstallColormap(display, cmap);
 
-	tqmask = GCBackground| GCForeground|  GCFunction; 
+	mask = GCBackground| GCForeground|  GCFunction; 
 
 	values.function = GXcopy;
 	values.background = colours[0].pixel;
 	values.foreground = colours[255].pixel;
 
 
-	gc = XtGetGC(colour_canvas, tqmask, &values);
+	gc = XtGetGC(colour_canvas, mask, &values);
 
 	colour_pm = XCreatePixmap(XtDisplay(top_level), 
 			XtWindow(colour_shell), width, height,
diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
index b19845b27..4d7493b27 100644
--- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
+++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
@@ -26,8 +26,8 @@
 const TQ_INT32 MAX_CHANNEL_YCbCr = 3;
 const TQ_INT32 MAX_CHANNEL_YCbCrA = 4;
 
-KisYCbCrU16ColorSpace::KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* tqparent, KisProfile* /*p*/)
-    : KisU16BaseColorSpace(KisID("YCbCrAU16", i18n("YCbCr (16-bit integer/channel)")), TYPE_YCbCr_16, icSigYCbCrData, tqparent, 0)
+KisYCbCrU16ColorSpace::KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* /*p*/)
+    : KisU16BaseColorSpace(KisID("YCbCrAU16", i18n("YCbCr (16-bit integer/channel)")), TYPE_YCbCr_16, icSigYCbCrData, parent, 0)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Y"), "Y", PIXEL_Y * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16)));
     m_channels.push_back(new KisChannelInfo(i18n("Cb"), "Cb", PIXEL_Cb * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16)));
@@ -230,21 +230,21 @@ void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT16 srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha != U16_OPACITY_TRANSPARENT) {
@@ -303,20 +303,20 @@ void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, c
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
     
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             TQ_UINT16 srcAlpha = s->alpha;
     
-                // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+                // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
     
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = UINT16_MULT(srcAlpha, d->alpha);
         }
diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
index d6ca157d0..d641f09e0 100644
--- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
+++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
@@ -31,7 +31,7 @@
 class KisYCbCrU16ColorSpace : public KisU16BaseColorSpace
 {
     public:
-        KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* tqparent, KisProfile* p);
+        KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p);
         ~KisYCbCrU16ColorSpace();
         virtual bool willDegrade(ColorSpaceIndependence )
         {
@@ -75,8 +75,8 @@ class KisYCbCrU16ColorSpace : public KisU16BaseColorSpace
                             TQ_INT32 cols,
                             const KisCompositeOp& op);
 
-        void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-        void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+        void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+        void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
 
     private:
 #define CLAMP_TO_16BITCHANNEL(a) CLAMP(a, 0, TQ_UINT16_MAX)
@@ -135,7 +135,7 @@ class KisYCbCrU16ColorSpaceFactory : public KisColorSpaceFactory
 
         virtual icColorSpaceSignature colorSpaceSignature() { return icSigYCbCrData; };
 
-        virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisYCbCrU16ColorSpace(tqparent, p); };
+        virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisYCbCrU16ColorSpace(parent, p); };
 
         virtual TQString defaultProfile() { return ""; };
 };
diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc
index d948097b7..7d926c480 100644
--- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc
+++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc
@@ -33,14 +33,14 @@ typedef KGenericFactory<YCbCrU16Plugin> YCbCrU16PluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalk_ycbcr_u16_plugin, YCbCrU16PluginFactory( "chalk" ) )
 
 
-YCbCrU16Plugin::YCbCrU16Plugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+YCbCrU16Plugin::YCbCrU16Plugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(YCbCrU16PluginFactory::instance());
 
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
 
         KisColorSpace * colorSpaceYCbCrU16 = new KisYCbCrU16ColorSpace(f, 0);
         KisColorSpaceFactory * csf = new KisYCbCrU16ColorSpaceFactory();
diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h
index ceb8ec6f4..1e3b58127 100644
--- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h
+++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h
@@ -29,7 +29,7 @@ class YCbCrU16Plugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    YCbCrU16Plugin(TQObject *tqparent, const char *name, const TQStringList &);
+    YCbCrU16Plugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~YCbCrU16Plugin();
 
 };
diff --git a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc
index 389a91b91..5cd132319 100644
--- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc
+++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc
@@ -26,8 +26,8 @@
 const TQ_INT32 MAX_CHANNEL_YCbCr = 3;
 const TQ_INT32 MAX_CHANNEL_YCbCrA = 4;
 
-KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* tqparent, KisProfile* /*p*/)
-    : KisU8BaseColorSpace(KisID("YCbCrAU8", i18n("YCbCr (8-bit integer/channel)")), TYPE_YCbCr_8, icSigYCbCrData, tqparent, 0)
+KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* /*p*/)
+    : KisU8BaseColorSpace(KisID("YCbCrAU8", i18n("YCbCr (8-bit integer/channel)")), TYPE_YCbCr_8, icSigYCbCrData, parent, 0)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Y"), "Y", PIXEL_Y * sizeof(TQ_UINT8), KisChannelInfo::COLOR, KisChannelInfo::UINT8, sizeof(TQ_UINT8)));
     m_channels.push_back(new KisChannelInfo(i18n("Cb"), "Cb", PIXEL_Cb * sizeof(TQ_UINT8), KisChannelInfo::COLOR, KisChannelInfo::UINT8, sizeof(TQ_UINT8)));
@@ -230,19 +230,19 @@ void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT8 srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                if (*tqmask != OPACITY_OPAQUE) {
-                    srcAlpha *= *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                if (*mask != OPACITY_OPAQUE) {
+                    srcAlpha *= *mask;
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha > OPACITY_TRANSPARENT) {
@@ -301,18 +301,18 @@ void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, co
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             TQ_UINT8 srcAlpha = s -> alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                if (*tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                if (*mask != OPACITY_OPAQUE) {
+                    srcAlpha = *mask;
                 }
-                tqmask++;
+                mask++;
             }
             d -> alpha = srcAlpha * d -> alpha;
         }
@@ -325,7 +325,7 @@ void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, co
     }
 }
 
-void KisYCbCrU8ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 */*tqmask*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 /*opacity*/)
+void KisYCbCrU8ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 */*mask*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 /*opacity*/)
 {
     while (rows > 0) {
         memcpy(dstRowStart, srcRowStart, numColumns * sizeof(Pixel));
diff --git a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h
index 6c2b21c7f..7f22343d6 100644
--- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h
+++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h
@@ -31,7 +31,7 @@
 class KisYCbCrU8ColorSpace : public KisU8BaseColorSpace
 {
     public:
-        KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* tqparent, KisProfile* p);
+        KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p);
         ~KisYCbCrU8ColorSpace();
         virtual bool willDegrade(ColorSpaceIndependence )
         {
@@ -75,9 +75,9 @@ class KisYCbCrU8ColorSpace : public KisU8BaseColorSpace
                             TQ_INT32 cols,
                             const KisCompositeOp& op);
 
-        void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-        void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-        void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+        void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+        void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+        void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
 
     private:
 #define CLAMP_TO_8BITCHANNEL(a) CLAMP(a, 0, TQ_UINT8_MAX)
@@ -136,7 +136,7 @@ class KisYCbCrU8ColorSpaceFactory : public KisColorSpaceFactory
 
         virtual icColorSpaceSignature colorSpaceSignature() { return icSigYCbCrData; };
 
-        virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisYCbCrU8ColorSpace(tqparent, p); };
+        virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisYCbCrU8ColorSpace(parent, p); };
 
         virtual TQString defaultProfile() { return ""; };
 };
diff --git a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc
index d1d19c32a..00487ce42 100644
--- a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc
+++ b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc
@@ -35,14 +35,14 @@ typedef KGenericFactory<YCbCrU8Plugin> YCbCrU8PluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalk_ycbcr_u8_plugin, YCbCrU8PluginFactory( "chalk" ) )
 
 
-YCbCrU8Plugin::YCbCrU8Plugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+YCbCrU8Plugin::YCbCrU8Plugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(YCbCrU8PluginFactory::instance());
 
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
 
         KisColorSpace * colorSpaceYCbCrU8 = new KisYCbCrU8ColorSpace(f, 0);
         KisColorSpaceFactory * csf = new KisYCbCrU8ColorSpaceFactory();
diff --git a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h
index 982746144..85127380d 100644
--- a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h
+++ b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h
@@ -29,7 +29,7 @@ class YCbCrU8Plugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    YCbCrU8Plugin(TQObject *tqparent, const char *name, const TQStringList &);
+    YCbCrU8Plugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~YCbCrU8Plugin();
 
 };
diff --git a/chalk/core/createdcop.py b/chalk/core/createdcop.py
index de773270f..2356a8c4a 100755
--- a/chalk/core/createdcop.py
+++ b/chalk/core/createdcop.py
@@ -34,7 +34,7 @@ class %(classname)sIface : virtual public DCOPObject
 {
 	K_DCOP
 public:
-	%(classname)sIface( %(classname)s * tqparent );
+	%(classname)sIface( %(classname)s * parent );
 k_dcop:
 
 private:
@@ -73,10 +73,10 @@ dcopiface_template = """/*
 
 #include <dcopclient.h>
 
-%(classname)sIface::%(classname)sIface( %(classname)s * tqparent )
+%(classname)sIface::%(classname)sIface( %(classname)s * parent )
 	: DCOPObject()
 {
-	m_parent = tqparent;
+	m_parent = parent;
 }
 
 """
diff --git a/chalk/core/kis_alpha_mask.cc b/chalk/core/kis_alpha_mask.cc
index 1b40e806b..3f382c305 100644
--- a/chalk/core/kis_alpha_mask.cc
+++ b/chalk/core/kis_alpha_mask.cc
@@ -109,19 +109,19 @@ void KisAlphaMask::computeAlpha(const TQImage& img)
     }
 }
 
-KisAlphaMaskSP KisAlphaMask::interpolate(KisAlphaMaskSP tqmask1, KisAlphaMaskSP tqmask2, double t)
+KisAlphaMaskSP KisAlphaMask::interpolate(KisAlphaMaskSP mask1, KisAlphaMaskSP mask2, double t)
 {
-    Q_ASSERT((tqmask1->width() == tqmask2->width()) && (tqmask1->height() == tqmask2->height()));
+    Q_ASSERT((mask1->width() == mask2->width()) && (mask1->height() == mask2->height()));
     Q_ASSERT(t > -DBL_EPSILON && t < 1 + DBL_EPSILON);
 
-    int width = tqmask1->width();
-    int height = tqmask1->height();
+    int width = mask1->width();
+    int height = mask1->height();
     KisAlphaMaskSP outputMask = new KisAlphaMask(width, height);
     Q_CHECK_PTR(outputMask);
 
     for (int x = 0; x < width; x++) {
         for (int y = 0; y < height; y++) {
-            TQ_UINT8 d = static_cast<TQ_UINT8>((1 - t) * tqmask1->alphaAt(x, y) + t * tqmask2->alphaAt(x, y));
+            TQ_UINT8 d = static_cast<TQ_UINT8>((1 - t) * mask1->alphaAt(x, y) + t * mask2->alphaAt(x, y));
             outputMask->setAlphaAt(x, y, d);
         }
     }
diff --git a/chalk/core/kis_alpha_mask.h b/chalk/core/kis_alpha_mask.h
index 5573f5e6c..c19cae59a 100644
--- a/chalk/core/kis_alpha_mask.h
+++ b/chalk/core/kis_alpha_mask.h
@@ -28,15 +28,15 @@
 
 /**
  * KisAlphaMask is intended to create alpha values from a TQImage for use
- * in brush creation. It is not a generic alpha tqmask that can be used with
+ * in brush creation. It is not a generic alpha mask that can be used with
  * KisPaintDevices: use a KisSelection for that.
  */
 class KisAlphaMask : public KShared {
     
  public:
     /**
-       Create an alpha tqmask based on the specified TQImage. If the image is
-       not a grayscale, the tqmask value is calculated from the effective grey
+       Create an alpha mask based on the specified TQImage. If the image is
+       not a grayscale, the mask value is calculated from the effective grey
        level and alpha value.
     */
     KisAlphaMask(const TQImage& img);
@@ -48,7 +48,7 @@ class KisAlphaMask : public KShared {
     KisAlphaMask(const TQImage& img, bool hasColor);
 
     /**
-       Create a transparent tqmask.
+       Create a transparent mask.
     */
     KisAlphaMask(TQ_INT32 width, TQ_INT32 height);
 
@@ -60,7 +60,7 @@ class KisAlphaMask : public KShared {
     TQ_INT32 height() const;
 
     /**
-       @return the number of lines in the tqmask.
+       @return the number of lines in the mask.
      */
        TQ_INT32 width() const;
 
@@ -68,14 +68,14 @@ class KisAlphaMask : public KShared {
        @return the alpha value at the specified position.
 
        Returns TQ_UINT8 OPACITY_TRANSPARENT if the value is
-       outside the bounds of the tqmask.
+       outside the bounds of the mask.
 
        XXX: this is, of course, not the best way of masking.
        Better would be to let KisAlphaMask fill a chunk of memory
        with the alpha values at the right position, something like
        void applyMask(TQ_UINT8 *pixeldata, TQ_INT32 pixelWidth,
        TQ_INT32 alphaPos). That would be fastest, or we could
-       provide an iterator over the tqmask, that would be nice, too.
+       provide an iterator over the mask, that would be nice, too.
     */
     inline TQ_UINT8 alphaAt(TQ_INT32 x, TQ_INT32 y) const
     {
@@ -89,9 +89,9 @@ class KisAlphaMask : public KShared {
 
     void setAlphaAt(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 alpha);
 
-    // Create a new tqmask by interpolating between tqmask1 and tqmask2 as t
+    // Create a new mask by interpolating between mask1 and mask2 as t
     // goes from 0 to 1.
-    static KisAlphaMaskSP interpolate(KisAlphaMaskSP tqmask1, KisAlphaMaskSP tqmask2, double t);
+    static KisAlphaMaskSP interpolate(KisAlphaMaskSP mask1, KisAlphaMaskSP mask2, double t);
 
 private:
     void computeAlpha(const TQImage& img);
diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc
index 60f475f0b..31ee9d181 100644
--- a/chalk/core/kis_brush.cc
+++ b/chalk/core/kis_brush.cc
@@ -375,7 +375,7 @@ TQImage KisBrush::img()
     return image;
 }
 
-KisAlphaMaskSP KisBrush::tqmask(const KisPaintInformation& info, double subPixelX, double subPixelY) const
+KisAlphaMaskSP KisBrush::mask(const KisPaintInformation& info, double subPixelX, double subPixelY) const
 {
     if (m_scaledBrushes.isEmpty()) {
         createScaledBrushes();
@@ -405,9 +405,9 @@ KisAlphaMaskSP KisBrush::tqmask(const KisPaintInformation& info, double subPixel
             // Exact match.
             outputMask = scaleMask(aboveBrush, scale, subPixelX, subPixelY);
         } else {
-            // We are smaller than the smallest tqmask, which is always 1x1.
+            // We are smaller than the smallest mask, which is always 1x1.
             double s = scale / aboveBrush->scale();
-            outputMask = scaleSinglePixelMask(s, aboveBrush->tqmask()->alphaAt(0, 0), subPixelX, subPixelY);
+            outputMask = scaleSinglePixelMask(s, aboveBrush->mask()->alphaAt(0, 0), subPixelX, subPixelY);
         }
     }
 
@@ -629,7 +629,7 @@ KisAlphaMaskSP KisBrush::scaleMask(const ScaledBrush *srcBrush, double scale, do
     KisAlphaMaskSP dstMask = new KisAlphaMask(dstWidth, dstHeight);
     Q_CHECK_PTR(dstMask);
 
-    KisAlphaMaskSP srcMask = srcBrush->tqmask();
+    KisAlphaMaskSP srcMask = srcBrush->mask();
 
     // Compute scales to map the scaled brush onto the required scale.
     double xScale = srcBrush->xScale() / scale;
@@ -1167,7 +1167,7 @@ TQImage KisBrush::interpolate(const TQImage& image1, const TQImage& image2, doub
 
 KisBrush::ScaledBrush::ScaledBrush()
 {
-    m_tqmask = 0;
+    m_mask = 0;
     m_image = TQImage();
     m_scale = 1;
     m_xScale = 1;
@@ -1176,7 +1176,7 @@ KisBrush::ScaledBrush::ScaledBrush()
 
 KisBrush::ScaledBrush::ScaledBrush(KisAlphaMaskSP scaledMask, const TQImage& scaledImage, double scale, double xScale, double yScale)
 {
-    m_tqmask = scaledMask;
+    m_mask = scaledMask;
     m_image = scaledImage;
     m_scale = scale;
     m_xScale = xScale;
@@ -1262,7 +1262,7 @@ void KisBrush::generateBoundary() {
     if (brushType() == IMAGE || brushType() == PIPE_IMAGE) {
         dev = image(KisMetaRegistry::instance()->csRegistry() ->getColorSpace(KisID("RGBA",""),""), KisPaintInformation());
     } else {
-        KisAlphaMaskSP atqmask = tqmask(KisPaintInformation());
+        KisAlphaMaskSP amask = mask(KisPaintInformation());
         KisColorSpace* cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),"");
         dev = new KisPaintDevice(cs, "tmp for generateBoundary");
         for (int y = 0; y < h; y++) {
@@ -1270,7 +1270,7 @@ void KisBrush::generateBoundary() {
             int x = 0;
 
             while(!it.isDone()) {
-                cs->setAlpha(it.rawData(), atqmask->alphaAt(x++, y), 1);
+                cs->setAlpha(it.rawData(), amask->alphaAt(x++, y), 1);
                 ++it;
             }
         }
diff --git a/chalk/core/kis_brush.h b/chalk/core/kis_brush.h
index 57dd9d9eb..9a7f3bb0a 100644
--- a/chalk/core/kis_brush.h
+++ b/chalk/core/kis_brush.h
@@ -77,10 +77,10 @@ public:
     virtual bool saveToDevice(TQIODevice* dev) const;
 
     /**
-       @return a tqmask computed from the grey-level values of the
+       @return a mask computed from the grey-level values of the
        pixels in the brush.
     */
-    virtual KisAlphaMaskSP tqmask(const KisPaintInformation& info,
+    virtual KisAlphaMaskSP mask(const KisPaintInformation& info,
                                 double subPixelX = 0, double subPixelY = 0) const;
     // XXX: return non-tiled simple buffer
     virtual KisPaintDeviceSP image(KisColorSpace * colorSpace, const KisPaintInformation& info,
@@ -94,7 +94,7 @@ public:
     double xSpacing(double pressure = PRESSURE_DEFAULT) const;
     double ySpacing(double pressure = PRESSURE_DEFAULT) const;
 
-    // Dimensions in pixels of the tqmask/image at a given pressure.
+    // Dimensions in pixels of the mask/image at a given pressure.
     TQ_INT32 maskWidth(const KisPaintInformation& info) const;
     TQ_INT32 maskHeight(const KisPaintInformation& info) const;
 
@@ -135,11 +135,11 @@ private:
         double scale() const { return m_scale; }
         double xScale() const { return m_xScale; }
         double yScale() const { return m_yScale; }
-        KisAlphaMaskSP tqmask() const { return m_tqmask; }
+        KisAlphaMaskSP mask() const { return m_mask; }
         TQImage image() const { return m_image; }
 
     private:
-        KisAlphaMaskSP m_tqmask;
+        KisAlphaMaskSP m_mask;
         TQImage m_image;
         double m_scale;
         double m_xScale;
diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cc
index 5b8fdcc91..54e730a71 100644
--- a/chalk/core/kis_fill_painter.cc
+++ b/chalk/core/kis_fill_painter.cc
@@ -203,10 +203,10 @@ void KisFillPainter::genericFillEnd(KisPaintDeviceSP filled) {
 }
 
 struct FillSegment {
-    FillSegment(int x, int y/*, FillSegment* tqparent*/) : x(x), y(y)/*, tqparent(tqparent)*/ {}
+    FillSegment(int x, int y/*, FillSegment* parent*/) : x(x), y(y)/*, parent(parent)*/ {}
     int x;
     int y;
-//    FillSegment* tqparent;
+//    FillSegment* parent;
 };
 
 typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus;
diff --git a/chalk/core/kis_fill_painter.h b/chalk/core/kis_fill_painter.h
index da244a67d..12aa0c2ff 100644
--- a/chalk/core/kis_fill_painter.h
+++ b/chalk/core/kis_fill_painter.h
@@ -102,7 +102,7 @@ public:
     void fillPattern(int startX, int startY);
 
     /**
-     * Returns a selection tqmask for the floodfill starting at the specified position.
+     * Returns a selection mask for the floodfill starting at the specified position.
      **/
     KisSelectionSP createFloodSelection(int startX, int startY);
 
diff --git a/chalk/core/kis_filter.h b/chalk/core/kis_filter.h
index 807ecff8b..193be6ced 100644
--- a/chalk/core/kis_filter.h
+++ b/chalk/core/kis_filter.h
@@ -158,12 +158,12 @@ public:
     /**
      * Create the configuration widget for this filter.
      *
-     * @param tqparent the TQt owner widget of this widget
+     * @param parent the TQt owner widget of this widget
      * @param dev the paintdevice this filter will act on
      * @return NULL if the filter does not use user-settable configuration settings.
      *         else return a pointer to the new configuration widget
      */
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget * tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget * parent, KisPaintDeviceSP dev);
 
     virtual void cancel() { m_cancelRequested = true; }
 
diff --git a/chalk/core/kis_filter_config_widget.cc b/chalk/core/kis_filter_config_widget.cc
index df7c13d5a..1df05f64d 100644
--- a/chalk/core/kis_filter_config_widget.cc
+++ b/chalk/core/kis_filter_config_widget.cc
@@ -19,8 +19,8 @@
 #include "kis_filter_config_widget.h"
 
 
-KisFilterConfigWidget::KisFilterConfigWidget(TQWidget * tqparent, const char * name, WFlags f)
-    : TQWidget(tqparent, name, f) 
+KisFilterConfigWidget::KisFilterConfigWidget(TQWidget * parent, const char * name, WFlags f)
+    : TQWidget(parent, name, f) 
 {
 }
 
diff --git a/chalk/core/kis_filter_config_widget.h b/chalk/core/kis_filter_config_widget.h
index ddb600ab0..f893b1388 100644
--- a/chalk/core/kis_filter_config_widget.h
+++ b/chalk/core/kis_filter_config_widget.h
@@ -33,7 +33,7 @@ class KisFilterConfigWidget : public TQWidget {
 
 public:
 
-    KisFilterConfigWidget(TQWidget * tqparent, const char * name = 0, WFlags f = 0 );
+    KisFilterConfigWidget(TQWidget * parent, const char * name = 0, WFlags f = 0 );
     virtual ~KisFilterConfigWidget();
 
     virtual void setConfiguration(KisFilterConfiguration * config) = 0;
diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc
index ea8d02135..1f08dbddc 100644
--- a/chalk/core/kis_group_layer.cc
+++ b/chalk/core/kis_group_layer.cc
@@ -90,9 +90,9 @@ bool KisGroupLayer::paintLayerInducesProjectionOptimization(KisPaintLayer* l) {
 
 KisPaintDeviceSP KisGroupLayer::projection(const TQRect & rect)
 {
-    // We don't have a tqparent, and we've got only one child: abuse the child's
+    // We don't have a parent, and we've got only one child: abuse the child's
     // paint device as the projection if the child is visible and 100% opaque
-    if (tqparent() == 0 && childCount() == 1) {
+    if (parent() == 0 && childCount() == 1) {
         KisPaintLayerSP l = dynamic_cast<KisPaintLayer*>(firstChild().data());
         if (paintLayerInducesProjectionOptimization(l)) {
             l->setClean(rect);
@@ -146,14 +146,14 @@ KisLayerSP KisGroupLayer::at(int index) const
 
 int KisGroupLayer::index(KisLayerSP layer) const
 {
-    if (layer->tqparent().data() == this)
+    if (layer->parent().data() == this)
         return layer->index();
     return -1;
 }
 
 void KisGroupLayer::setIndex(KisLayerSP layer, int index)
 {
-    if (layer->tqparent().data() != this)
+    if (layer->parent().data() != this)
         return;
     //TODO optimize
     removeLayer(layer);
@@ -163,7 +163,7 @@ void KisGroupLayer::setIndex(KisLayerSP layer, int index)
 bool KisGroupLayer::addLayer(KisLayerSP newLayer, int x)
 {
     if (x < 0 || kClamp(uint(x), uint(0), childCount()) != uint(x) ||
-        newLayer->tqparent() || m_layers.contains(newLayer))
+        newLayer->parent() || m_layers.contains(newLayer))
     {
         kdWarning() << "invalid input to KisGroupLayer::addLayer(KisLayerSP newLayer, int x)!" << endl;
         return false;
@@ -185,7 +185,7 @@ bool KisGroupLayer::addLayer(KisLayerSP newLayer, int x)
 
 bool KisGroupLayer::addLayer(KisLayerSP newLayer, KisLayerSP aboveThis)
 {
-    if (aboveThis && aboveThis->tqparent().data() != this)
+    if (aboveThis && aboveThis->parent().data() != this)
     {
         kdWarning() << "invalid input to KisGroupLayer::addLayer(KisLayerSP newLayer, KisLayerSP aboveThis)!" << endl;
         return false;
@@ -219,7 +219,7 @@ bool KisGroupLayer::removeLayer(int x)
 
 bool KisGroupLayer::removeLayer(KisLayerSP layer)
 {
-    if (layer->tqparent().data() != this)
+    if (layer->parent().data() != this)
     {
         kdWarning() << "invalid input to KisGroupLayer::removeLayer()!" << endl;
         return false;
@@ -317,7 +317,7 @@ void KisGroupLayer::updateProjection(const TQRect & rc)
 
     // If this is the rootlayer, don't do anything with adj. layers that are below the
     // first paintlayer
-    bool gotPaintLayer = (tqparent() != 0);
+    bool gotPaintLayer = (parent() != 0);
 
     // Look through all the child layers, searching for the first dirty layer
     // if it's found, and if we have found an adj. layer before the the dirty layer,
@@ -404,8 +404,8 @@ void KisGroupLayer::updateProjection(const TQRect & rc)
             const KisCompositeOp cop = child->compositeOp();
             const bool block = child->signalsBlocked();
             child->blockSignals(true);
-            // Composite op copy doesn't take a tqmask/selection into account, so we need
-            // to make a difference between a paintlayer with a tqmask, and one without
+            // Composite op copy doesn't take a mask/selection into account, so we need
+            // to make a difference between a paintlayer with a mask, and one without
             KisPaintLayer* l = dynamic_cast<KisPaintLayer*>(child.data());
             if (l && l->hasMask())
                 child->m_compositeOp = COMPOSITE_OVER;
diff --git a/chalk/core/kis_group_layer.h b/chalk/core/kis_group_layer.h
index 3a2e042ad..a516ac723 100644
--- a/chalk/core/kis_group_layer.h
+++ b/chalk/core/kis_group_layer.h
@@ -48,14 +48,14 @@ public:
 public:
 
     /**
-     * Set the entire layer extent dirty; this percolates up to tqparent layers all the
+     * Set the entire layer extent dirty; this percolates up to parent layers all the
      * way to the root layer.
      */
     virtual void setDirty(bool propagate = true);
 
     /**
      * Add the given rect to the set of dirty rects for this layer;
-     * this percolates up to tqparent layers all the way to the root
+     * this percolates up to parent layers all the way to the root
      * layer.
      */
     virtual void setDirty(const TQRect & rect, bool propagate = true);
diff --git a/chalk/core/kis_image.cc b/chalk/core/kis_image.cc
index 30f3ad364..1efeb7152 100644
--- a/chalk/core/kis_image.cc
+++ b/chalk/core/kis_image.cc
@@ -258,12 +258,12 @@ namespace {
         typedef KisImageCommand super;
 
     public:
-        KisLayerPositionCommand(const TQString& name, KisImageSP image, KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis) : super(name, image)
+        KisLayerPositionCommand(const TQString& name, KisImageSP image, KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis) : super(name, image)
             {
                 m_layer = layer;
-                m_oldParent = layer->tqparent();
+                m_oldParent = layer->parent();
                 m_oldAboveThis = layer->nextSibling();
-                m_newParent = tqparent;
+                m_newParent = parent;
                 m_newAboveThis = aboveThis;
            }
 
@@ -300,7 +300,7 @@ namespace {
             {
                 m_img = img;
                 m_layer = layer;
-                m_parent = layer->tqparent();
+                m_parent = layer->parent();
                 m_aboveThis = layer->nextSibling();
             }
 
@@ -385,7 +385,7 @@ namespace {
                 m_layer = layer;
                 m_prevParent = wasParent;
                 m_prevAbove = wasAbove;
-                m_newParent = layer->tqparent();
+                m_newParent = layer->parent();
                 m_newAbove = layer->nextSibling();
             }
 
@@ -1048,7 +1048,7 @@ KisLayerSP KisImage::newLayer(const TQString& name, TQ_UINT8 opacity, const KisC
     layer->setVisible(true);
 
     if (m_activeLayer != 0) {
-        addLayer(layer, m_activeLayer->tqparent().data(), m_activeLayer->nextSibling());
+        addLayer(layer, m_activeLayer->parent().data(), m_activeLayer->nextSibling());
     }
     else {
         addLayer(layer, m_rootLayer, 0);
@@ -1116,17 +1116,17 @@ KisLayerSP KisImage::findLayer(int id) const
 }
 
 
-bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP tqparent)
+bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP parent)
 {
-    return addLayer(layer, tqparent, tqparent->firstChild());
+    return addLayer(layer, parent, parent->firstChild());
 }
 
-bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis)
+bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis)
 {
-    if (!tqparent)
+    if (!parent)
         return false;
 
-    const bool success = tqparent->addLayer(layer, aboveThis);
+    const bool success = parent->addLayer(layer, aboveThis);
     if (success)
     {
         KisPaintLayerSP player = dynamic_cast<KisPaintLayer*>(layer.data());
@@ -1163,7 +1163,7 @@ bool KisImage::removeLayer(KisLayerSP layer)
     if (!layer || layer->image() != this)
         return false;
 
-    if (KisGroupLayerSP tqparent = layer->tqparent()) {
+    if (KisGroupLayerSP parent = layer->parent()) {
         // Adjustment layers should mark the layers underneath them, whose rendering
         // they have cached, diryt on removal. Otherwise, the group won't be re-rendered.
         KisAdjustmentLayer * al = dynamic_cast<KisAdjustmentLayer*>(layer.data());
@@ -1196,21 +1196,21 @@ bool KisImage::removeLayer(KisLayerSP layer)
         const bool wasActive = layer == activeLayer();
         // sigLayerRemoved can set it to 0, we don't want that in the else of wasActive!
         KisLayerSP actLayer = activeLayer();
-        const bool success = tqparent->removeLayer(layer);
+        const bool success = parent->removeLayer(layer);
         if (success) {
             layer->setImage(0);
             if (!layer->temporary() && undo()) {
-                m_adapter->addCommand(new LayerRmCmd(m_adapter, this, layer, tqparent, wasAbove));
+                m_adapter->addCommand(new LayerRmCmd(m_adapter, this, layer, parent, wasAbove));
             }
             if (!layer->temporary()) {
-                emit sigLayerRemoved(layer, tqparent, wasAbove);
+                emit sigLayerRemoved(layer, parent, wasAbove);
                 if (wasActive) {
                     if (wasBelow)
                         activate(wasBelow);
                     else if (wasAbove)
                         activate(wasAbove);
-                    else if (tqparent != rootLayer())
-                        activate(tqparent.data());
+                    else if (parent != rootLayer())
+                        activate(parent.data());
                     else
                         activate(rootLayer()->firstChild());
                 } else {
@@ -1228,7 +1228,7 @@ bool KisImage::raiseLayer(KisLayerSP layer)
 {
     if (!layer)
         return false;
-    return moveLayer(layer, layer->tqparent().data(), layer->prevSibling());
+    return moveLayer(layer, layer->parent().data(), layer->prevSibling());
 }
 
 bool KisImage::lowerLayer(KisLayerSP layer)
@@ -1236,7 +1236,7 @@ bool KisImage::lowerLayer(KisLayerSP layer)
     if (!layer)
         return false;
     if (KisLayerSP next = layer->nextSibling())
-        return moveLayer(layer, layer->tqparent().data(), next->nextSibling());
+        return moveLayer(layer, layer->parent().data(), next->nextSibling());
     return false;
 }
 
@@ -1254,15 +1254,15 @@ bool KisImage::toBottom(KisLayerSP layer)
     return moveLayer(layer, rootLayer(), 0);
 }
 
-bool KisImage::moveLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis)
+bool KisImage::moveLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis)
 {
-    if (!tqparent)
+    if (!parent)
         return false;
 
-    KisGroupLayerSP wasParent = layer->tqparent();
+    KisGroupLayerSP wasParent = layer->parent();
     KisLayerSP wasAbove = layer->nextSibling();
 
-    if (wasParent.data() == tqparent.data() && wasAbove.data() == aboveThis.data())
+    if (wasParent.data() == parent.data() && wasAbove.data() == aboveThis.data())
         return false;
 
     lock();
@@ -1272,7 +1272,7 @@ bool KisImage::moveLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP
         return false;
     }
 
-    const bool success = tqparent->addLayer(layer, aboveThis);
+    const bool success = parent->addLayer(layer, aboveThis);
 
     layer->setDirty();
 
@@ -1357,7 +1357,7 @@ void KisImage::mergeLayer(KisLayerSP layer)
     layer->accept(visitor);
 
     removeLayer(layer->nextSibling());
-    addLayer(player, layer->tqparent(), layer);
+    addLayer(player, layer->parent(), layer);
     removeLayer(layer);
 
     undoAdapter()->endMacro();
diff --git a/chalk/core/kis_image.h b/chalk/core/kis_image.h
index 4db23d3c6..132505b29 100644
--- a/chalk/core/kis_image.h
+++ b/chalk/core/kis_image.h
@@ -248,23 +248,23 @@ public:
     KisLayerSP findLayer(int id) const;
 
     /// Move layer to specified position
-    bool moveLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis);
+    bool moveLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis);
 
     /**
     * Add an already existing layer to the image. The layer is put on top
     * of the layers in the specified layergroup
     * @param layer the layer to be added
-    * @param tqparent the tqparent layer
+    * @param parent the parent layer
     */
-    bool addLayer(KisLayerSP layer, KisGroupLayerSP tqparent);
+    bool addLayer(KisLayerSP layer, KisGroupLayerSP parent);
     
     /**
     * Add already existing layer to image.
     *
     * @param layer the layer to be added
-    * @param tqparent the tqparent layer
+    * @param parent the parent layer
     * @param aboveThis in the list with child layers of the specified
-    *                  tqparent, add this layer above the specified sibling.
+    *                  parent, add this layer above the specified sibling.
     *                  if 0, the layer is put in the lowermost position in
     *                  its group.
     * @param notify If true, the image is immediately recomposited, if false,
@@ -272,7 +272,7 @@ public:
     *
     * returns false if adding the layer didn't work, true if the layer got added
     */
-    bool addLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis);
+    bool addLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis);
 
     /// Remove layer
     bool removeLayer(KisLayerSP layer);
@@ -355,21 +355,21 @@ signals:
     /// Emitted after a different layer is made active.
     void sigLayerActivated(KisLayerSP layer);
 
-    /// Emitted after a layer is added: you can find out where by asking it for its tqparent(), et al.
+    /// Emitted after a layer is added: you can find out where by asking it for its parent(), et al.
     void sigLayerAdded(KisLayerSP layer);
 
     /** Emitted after a layer is removed.
         It's no longer in the image, but still exists, so @p layer is valid.
 
         @param layer the removed layer
-        @param tqparent the tqparent of the layer, before it was removed
+        @param parent the parent of the layer, before it was removed
         @param wasAboveThis the layer it was above, before it was removed.
     */
     void sigLayerRemoved(KisLayerSP layer, KisGroupLayerSP wasParent, KisLayerSP wasAboveThis);
 
-    /** Emitted after a layer is moved to a different position under its tqparent layer, or its tqparent changes.
+    /** Emitted after a layer is moved to a different position under its parent layer, or its parent changes.
 
-        @param previousParent the tqparent of the layer, before it was moved
+        @param previousParent the parent of the layer, before it was moved
         @param wasAboveThis the layer it was above, before it was moved.
     */
     void sigLayerMoved(KisLayerSP layer, KisGroupLayerSP previousParent, KisLayerSP wasAboveThis);
@@ -409,7 +409,7 @@ signals:
     void sigColorSpaceChanged(KisColorSpace*  cs);
 
 
-    /// Emitted when any layer's tqmask info got updated (or when the current layer changes)
+    /// Emitted when any layer's mask info got updated (or when the current layer changes)
     void sigMaskInfoChanged();
 public slots:
     void slotSelectionChanged();
diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc
index 9b71c83df..726d0295f 100644
--- a/chalk/core/kis_imagepipe_brush.cc
+++ b/chalk/core/kis_imagepipe_brush.cc
@@ -318,11 +318,11 @@ TQImage KisImagePipeBrush::img()
     }
 }
 
-KisAlphaMaskSP KisImagePipeBrush::tqmask(const KisPaintInformation& info, double subPixelX, double subPixelY) const
+KisAlphaMaskSP KisImagePipeBrush::mask(const KisPaintInformation& info, double subPixelX, double subPixelY) const
 {
     if (m_brushes.isEmpty()) return 0;
     selectNextBrush(info);
-    return m_brushes.at(m_currentBrush)->tqmask(info, subPixelX, subPixelY);
+    return m_brushes.at(m_currentBrush)->mask(info, subPixelX, subPixelY);
 }
 
 KisPaintDeviceSP KisImagePipeBrush::image(KisColorSpace * colorSpace, const KisPaintInformation& info, double subPixelX, double subPixelY) const
diff --git a/chalk/core/kis_imagepipe_brush.h b/chalk/core/kis_imagepipe_brush.h
index bc54204b6..eea581945 100644
--- a/chalk/core/kis_imagepipe_brush.h
+++ b/chalk/core/kis_imagepipe_brush.h
@@ -125,9 +125,9 @@ public:
     virtual TQImage img();
 
     /**
-       @return the next tqmask in the pipe.
+       @return the next mask in the pipe.
     */
-    virtual KisAlphaMaskSP tqmask(const KisPaintInformation& info,
+    virtual KisAlphaMaskSP mask(const KisPaintInformation& info,
                                 double subPixelX = 0, double subPixelY = 0) const;
     virtual KisPaintDeviceSP image(KisColorSpace * colorSpace, const KisPaintInformation& info,
                              double subPixelX = 0, double subPixelY = 0) const;
diff --git a/chalk/core/kis_iteratorpixeltrait.h b/chalk/core/kis_iteratorpixeltrait.h
index 5d2c957ff..2b047c0ec 100644
--- a/chalk/core/kis_iteratorpixeltrait.h
+++ b/chalk/core/kis_iteratorpixeltrait.h
@@ -103,7 +103,7 @@ public:
         };
 
     /**
-     * Returns the selectiontqmask from the current point; this is guaranteed
+     * Returns the selectionmask from the current point; this is guaranteed
      * to have the same number of consecutive pixels that the iterator has
      * at a given point. It return a 0 if there is no selection.
      */
diff --git a/chalk/core/kis_iterators_pixel.h b/chalk/core/kis_iterators_pixel.h
index bd82f856e..65ad78317 100644
--- a/chalk/core/kis_iterators_pixel.h
+++ b/chalk/core/kis_iterators_pixel.h
@@ -66,10 +66,10 @@ public:
     
     TQ_INT32 nConseqHPixels() const {
         if (m_selectionIterator) {
-            TQ_INT32 tqparent = KisHLineIteratorPixel::nConseqHPixels();
+            TQ_INT32 parent = KisHLineIteratorPixel::nConseqHPixels();
             TQ_INT32 selection = m_selectionIterator->nConseqHPixels();
-            if (tqparent < selection)
-                return tqparent;
+            if (parent < selection)
+                return parent;
             return selection;
         }
         return KisHLineIteratorPixel::nConseqHPixels();
@@ -137,10 +137,10 @@ public:
 
     TQ_INT32 nConseqPixels() const {
         if (m_selectionIterator) {
-            TQ_INT32 tqparent = KisRectIterator::nConseqPixels();
+            TQ_INT32 parent = KisRectIterator::nConseqPixels();
             TQ_INT32 selection = m_selectionIterator->nConseqPixels();
-            if (tqparent < selection)
-                return tqparent;
+            if (parent < selection)
+                return parent;
             return selection;
         }
         return KisRectIterator::nConseqPixels();
diff --git a/chalk/core/kis_layer.cc b/chalk/core/kis_layer.cc
index 752159c08..2b7307e5f 100644
--- a/chalk/core/kis_layer.cc
+++ b/chalk/core/kis_layer.cc
@@ -341,7 +341,7 @@ void KisLayer::setDirty(bool propagate)
 
     if (rc.isValid()) m_dirtyRect = rc;
 
-    // If we're dirty, our tqparent is dirty, if we've got a tqparent
+    // If we're dirty, our parent is dirty, if we've got a parent
     if (propagate && m_parent && rc.isValid()) m_parent->setDirty(m_dirtyRect);
 
     if (m_image && rc.isValid()) {
@@ -351,7 +351,7 @@ void KisLayer::setDirty(bool propagate)
 
 void KisLayer::setDirty(const TQRect & rc, bool propagate)
 {
-    // If we're dirty, our tqparent is dirty, if we've got a tqparent
+    // If we're dirty, our parent is dirty, if we've got a parent
 
     if (rc.isValid())
         m_dirtyRect |= rc;
@@ -364,23 +364,23 @@ void KisLayer::setDirty(const TQRect & rc, bool propagate)
     }
 }
 
-KisGroupLayerSP KisLayer::tqparent() const
+KisGroupLayerSP KisLayer::parent() const
 {
     return m_parent;
 }
 
 KisLayerSP KisLayer::prevSibling() const
 {
-    if (!tqparent())
+    if (!parent())
         return 0;
-    return tqparent()->at(index() - 1);
+    return parent()->at(index() - 1);
 }
 
 KisLayerSP KisLayer::nextSibling() const
 {
-    if (!tqparent())
+    if (!parent())
         return 0;
-    return tqparent()->at(index() + 1);
+    return parent()->at(index() + 1);
 }
 
 int KisLayer::index() const
@@ -390,9 +390,9 @@ int KisLayer::index() const
 
 void KisLayer::setIndex(int i)
 {
-    if (!tqparent())
+    if (!parent())
         return;
-    tqparent()->setIndex(this, i);
+    parent()->setIndex(this, i);
 }
 
 KisLayerSP KisLayer::findLayer(const TQString& n) const
diff --git a/chalk/core/kis_layer.h b/chalk/core/kis_layer.h
index 09ecd2357..2cff4bc99 100644
--- a/chalk/core/kis_layer.h
+++ b/chalk/core/kis_layer.h
@@ -69,14 +69,14 @@ public:
     
     
     /**
-     * Set the entire layer extent dirty; this percolates up to tqparent layers all the
+     * Set the entire layer extent dirty; this percolates up to parent layers all the
      * way to the root layer.
      */
     virtual void setDirty(bool propagate = true);
 
     /**
      * Add the given rect to the set of dirty rects for this layer;
-     * this percolates up to tqparent layers all the way to the root
+     * this percolates up to parent layers all the way to the root
      * layer.
      */
     virtual void setDirty(const TQRect & rect, bool propagate = true);
@@ -87,41 +87,41 @@ public:
     /// Returns the ID of the layer, which is guaranteed to be unique among all KisLayers.
     int id() const { return m_id; }
 
-    /* Returns the index of the layer in its tqparent's list of child layers. Indices
+    /* Returns the index of the layer in its parent's list of child layers. Indices
      * increase from 0, which is the topmost layer in the list, to the bottommost.
      */
     virtual int index() const;
 
-    /// Moves this layer to the specified index within its tqparent's list of child layers.
+    /// Moves this layer to the specified index within its parent's list of child layers.
     virtual void setIndex(int index);
 
     /**
-     * Returns the tqparent layer of a layer. This is 0 only for a root layer; otherwise
+     * Returns the parent layer of a layer. This is 0 only for a root layer; otherwise
      * this will be an actual GroupLayer */
-    virtual KisGroupLayerSP tqparent() const;
+    virtual KisGroupLayerSP parent() const;
 
     /**
-     * Returns the previous sibling of this layer in the tqparent's list. This is the layer
-     * *above* this layer. 0 is returned if there is no tqparent, or if this child has no more
+     * Returns the previous sibling of this layer in the parent's list. This is the layer
+     * *above* this layer. 0 is returned if there is no parent, or if this child has no more
      * previous siblings (== firstChild())
      */
     virtual KisLayerSP prevSibling() const;
 
     /**
-     * Returns the next sibling of this layer in the tqparent's list. This is the layer *below*
-     * this layer. 0 is returned if there is no tqparent, or if this child has no more next 
+     * Returns the next sibling of this layer in the parent's list. This is the layer *below*
+     * this layer. 0 is returned if there is no parent, or if this child has no more next 
      * siblings (== lastChild())
      */
     virtual KisLayerSP nextSibling() const;
 
     /**
-     * Returns the sibling above this layer in its tqparent's list. 0 is returned if there is no tqparent,
+     * Returns the sibling above this layer in its parent's list. 0 is returned if there is no parent,
      * or if this layer is the topmost layer in its group. This is the same as calling prevSibling().
      */
     KisLayerSP siblingAbove() const { return prevSibling(); }
 
     /**
-     * Returns the sibling below this layer in its tqparent's list. 0 is returned if there is no tqparent,
+     * Returns the sibling below this layer in its parent's list. 0 is returned if there is no parent,
      * or if this layer is the bottommost layer in its group.  This is the same as calling nextSibling().
      */
     KisLayerSP siblingBelow() const { return nextSibling(); }
@@ -197,7 +197,7 @@ public:
 
     KisUndoAdapter *undoAdapter() const;
 
-    /// paints a tqmask where the selection on this layer resides
+    /// paints a mask where the selection on this layer resides
     virtual void paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h);
     virtual void paintSelection(TQImage &img, const TQRect& scaledImageRect, const TQSize& scaledImageSize, const TQSize& imageSize);
 
diff --git a/chalk/core/kis_merge_visitor.h b/chalk/core/kis_merge_visitor.h
index 721ce827e..afd8fb378 100644
--- a/chalk/core/kis_merge_visitor.h
+++ b/chalk/core/kis_merge_visitor.h
@@ -114,11 +114,11 @@ public:
             gc.bitBlt(dx, dy, layer->compositeOp(), source, layer->opacity(), sx, sy, w, h);
         } else {
             if (layer->renderMask()) {
-                // To display the tqmask, we don't do things with composite op and opacity
+                // To display the mask, we don't do things with composite op and opacity
                 // This is like the gimp does it, I guess that's ok?
 
                 // Note that here we'll use m_rc, because even if the extent of the device is
-                // empty, we want a full tqmask to be drawn! (we don't change rc, since
+                // empty, we want a full mask to be drawn! (we don't change rc, since
                 // it'd mess with setClean). This is because KisPainter::bitBlt &'s with
                 // the source device's extent. This is ok in normal circumstances, but
                 // we changed the default tile. Fixing this properly would mean fixing it there.
@@ -129,36 +129,36 @@ public:
                 dx = sx;
                 dy = sy;
 
-                // The problem is that the extent of the layer tqmask might not be extended
+                // The problem is that the extent of the layer mask might not be extended
                 // enough. Check if that is the case
-                KisPaintDeviceSP tqmask = layer->getMask();
-                TQRect mextent = tqmask->extent();
+                KisPaintDeviceSP mask = layer->getMask();
+                TQRect mextent = mask->extent();
                 if ((mextent & m_rc) != m_rc) {
                     // Iterate over all pixels in the m_rc area. With just accessing the
                     // tiles in read-write mode, we ensure that the tiles get created if they
                     // do not exist. If they do, they'll remain untouched since we don't
                     // actually write data to it.
                     // XXX Admission: this is actually kind of a hack :-(
-                    KisRectIteratorPixel it = tqmask->createRectIterator(sx, sy, w, h, true);
+                    KisRectIteratorPixel it = mask->createRectIterator(sx, sy, w, h, true);
                     while (!it.isDone())
                         ++it;
                 }
                 if (tempTarget) {
                     KisPaintDeviceSP temp = new KisPaintDevice(source->colorSpace());
-                    tqmask = paintIndirect(tqmask, temp, layer, sx, sy, dx, dy, w, h);
+                    mask = paintIndirect(mask, temp, layer, sx, sy, dx, dy, w, h);
                 }
 
-                gc.bitBlt(dx, dy, COMPOSITE_OVER, tqmask, OPACITY_OPAQUE, sx, sy, w, h);
+                gc.bitBlt(dx, dy, COMPOSITE_OVER, mask, OPACITY_OPAQUE, sx, sy, w, h);
             } else {
-                KisSelectionSP tqmask = layer->getMaskAsSelection();
-                // The indirect painting happens on the tqmask
+                KisSelectionSP mask = layer->getMaskAsSelection();
+                // The indirect painting happens on the mask
                 if (tempTarget && layer->editMask()) {
                     KisPaintDeviceSP maskSrc = layer->getMask();
                     KisPaintDeviceSP temp = new KisPaintDevice(maskSrc->colorSpace());
                     temp = paintIndirect(maskSrc, temp, layer, sx, sy, dx, dy, w, h);
                     // Blegh
                     KisRectIteratorPixel srcIt = temp->createRectIterator(sx, sy, w, h, false);
-                    KisRectIteratorPixel dstIt = tqmask->createRectIterator(sx, sy, w, h, true);
+                    KisRectIteratorPixel dstIt = mask->createRectIterator(sx, sy, w, h, true);
 
                     while(!dstIt.isDone()) {
                         // Same as in convertMaskToSelection
@@ -167,7 +167,7 @@ public:
                         ++dstIt;
                     }
                 } else if (tempTarget) {
-                    // We have a tqmask, and paint indirect, but not on the tqmask
+                    // We have a mask, and paint indirect, but not on the mask
                     KisPaintDeviceSP temp = new KisPaintDevice(source->colorSpace());
                     source = paintIndirect(source, temp, layer, sx, sy, dx, dy, w, h);
                 }
@@ -175,7 +175,7 @@ public:
                 gc.bltSelection(dx, dy,
                                 layer->compositeOp(),
                                 source,
-                                tqmask,
+                                mask,
                                 layer->opacity(), sx, sy, w, h);
             }
         }
diff --git a/chalk/core/kis_paint_device.cc b/chalk/core/kis_paint_device.cc
index 59665829f..195364c6a 100644
--- a/chalk/core/kis_paint_device.cc
+++ b/chalk/core/kis_paint_device.cc
@@ -236,7 +236,7 @@ KisPaintDevice::KisPaintDevice(KisColorSpace * colorSpace, const char * name) :
 
 }
 
-KisPaintDevice::KisPaintDevice(KisLayer *tqparent, KisColorSpace * colorSpace, const char * name) :
+KisPaintDevice::KisPaintDevice(KisLayer *parent, KisColorSpace * colorSpace, const char * name) :
         TQObject(0, name), KShared(), m_exifInfo(0), m_lock( false )
 {
 
@@ -250,10 +250,10 @@ KisPaintDevice::KisPaintDevice(KisLayer *tqparent, KisColorSpace * colorSpace, c
     m_selectionDeselected = false;
     m_selection = 0;
 
-    m_parentLayer = tqparent;
+    m_parentLayer = parent;
 
-    if (colorSpace == 0 && tqparent != 0 && tqparent->image() != 0) {
-        m_colorSpace = tqparent->image()->colorSpace();
+    if (colorSpace == 0 && parent != 0 && parent->image() != 0) {
+        m_colorSpace = parent->image()->colorSpace();
     }
     else {
         m_colorSpace = colorSpace;
@@ -1107,15 +1107,15 @@ void KisPaintDevice::clearSelection()
     }
 }
 
-void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask)
+void KisPaintDevice::applySelectionMask(KisSelectionSP mask)
 {
-    TQRect r = tqmask->selectedRect();
+    TQRect r = mask->selectedRect();
     crop(r);
 
     for (TQ_INT32 y = r.top(); y <= r.bottom(); ++y) {
 
         KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true);
-        KisHLineIterator maskIt = tqmask->createHLineIterator(r.x(), y, r.width(), false);
+        KisHLineIterator maskIt = mask->createHLineIterator(r.x(), y, r.width(), false);
 
         while (!pixelIt.isDone()) {
             // XXX: Optimize by using stretches
diff --git a/chalk/core/kis_paint_device.h b/chalk/core/kis_paint_device.h
index 7fe6250bd..5e5dbb3f6 100644
--- a/chalk/core/kis_paint_device.h
+++ b/chalk/core/kis_paint_device.h
@@ -274,7 +274,7 @@ public:
     virtual TQImage convertToTQImage(KisProfile *  dstProfile, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h, float exposure = 0.0f);
 
     /**
-     * Create an RGBA TQImage from a rectangle in the paint device. The rectangle is defined by the tqparent image's bounds.
+     * Create an RGBA TQImage from a rectangle in the paint device. The rectangle is defined by the parent image's bounds.
      *
      * @param dstProfile RGB profile to use in conversion. May be 0, in which
      * case it's up to the colour strategy to choose a profile (most
@@ -403,12 +403,12 @@ public:
     void setParentLayer(KisLayer *parentLayer);
 
     /**
-     * Add the specified rect top the tqparent layer (if present)
+     * Add the specified rect top the parent layer (if present)
      */
     virtual void setDirty(const TQRect & rc);
 
     /**
-     * Set the tqparent layer completely dirty, if this paint device has one.
+     * Set the parent layer completely dirty, if this paint device has one.
      */
     virtual void setDirty();
     
@@ -479,10 +479,10 @@ public:
     void clearSelection();
 
     /**
-     * Apply a tqmask to the image data, i.e. multiply each pixel's opacity by its
-     * selectedness in the tqmask.
+     * Apply a mask to the image data, i.e. multiply each pixel's opacity by its
+     * selectedness in the mask.
      */
-    void applySelectionMask(KisSelectionSP tqmask);
+    void applySelectionMask(KisSelectionSP mask);
 
     /**
      * Sets the selection of this paint device to the new selection,
diff --git a/chalk/core/kis_paint_device_iface.cc b/chalk/core/kis_paint_device_iface.cc
index 1aace538a..220c716b4 100644
--- a/chalk/core/kis_paint_device_iface.cc
+++ b/chalk/core/kis_paint_device_iface.cc
@@ -27,10 +27,10 @@
 
 #include "kis_paint_device.h"
 
-KisPaintDeviceIface::KisPaintDeviceIface( KisPaintDevice * tqparent )
+KisPaintDeviceIface::KisPaintDeviceIface( KisPaintDevice * parent )
     : DCOPObject("paintdevice")
 {
-    m_parent = tqparent;
+    m_parent = parent;
 }
 
 TQ_INT32 KisPaintDeviceIface::pixelSize() const
diff --git a/chalk/core/kis_paint_device_iface.h b/chalk/core/kis_paint_device_iface.h
index df7c9372f..eee4d3f59 100644
--- a/chalk/core/kis_paint_device_iface.h
+++ b/chalk/core/kis_paint_device_iface.h
@@ -31,7 +31,7 @@ class KisPaintDeviceIface : virtual public DCOPObject
 {
     K_DCOP
 public:
-    KisPaintDeviceIface( KisPaintDevice * tqparent );
+    KisPaintDeviceIface( KisPaintDevice * parent );
 k_dcop:
 
     /**
diff --git a/chalk/core/kis_paint_layer.cc b/chalk/core/kis_paint_layer.cc
index 2df12e01d..a4c5412d5 100644
--- a/chalk/core/kis_paint_layer.cc
+++ b/chalk/core/kis_paint_layer.cc
@@ -39,7 +39,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
     Q_ASSERT(img);
     Q_ASSERT(dev);
     m_paintdev = dev;
-    m_tqmask = 0;
+    m_mask = 0;
     m_maskAsSelection = 0;
     m_paintdev->setParentLayer(this);
     m_renderMask = false;
@@ -52,7 +52,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
 {
     Q_ASSERT(img);
     m_paintdev = new KisPaintDevice(this, img->colorSpace(), name.latin1());
-    m_tqmask = 0;
+    m_mask = 0;
     m_maskAsSelection = 0;
     m_renderMask = false;
     m_editMask = true;
@@ -64,7 +64,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
     Q_ASSERT(img);
     Q_ASSERT(colorSpace);
     m_paintdev = new KisPaintDevice(this, colorSpace,  name.latin1());
-    m_tqmask = 0;
+    m_mask = 0;
     m_maskAsSelection = 0;
     m_renderMask = false;
     m_editMask = true;
@@ -76,8 +76,8 @@ KisPaintLayer::KisPaintLayer(const KisPaintLayer& rhs) :
     m_paintdev = new KisPaintDevice( *rhs.m_paintdev.data() );
     m_paintdev->setParentLayer(this);
     if (rhs.hasMask()) {
-        m_tqmask = new KisPaintDevice(*rhs.m_tqmask.data());
-        m_tqmask->setParentLayer(this);
+        m_mask = new KisPaintDevice(*rhs.m_mask.data());
+        m_mask->setParentLayer(this);
     }
     m_renderMask = rhs.m_renderMask;
     m_editMask = rhs.m_editMask;
@@ -93,8 +93,8 @@ KisPaintLayer::~KisPaintLayer()
     if (m_paintdev != 0) {
         m_paintdev->setParentLayer(0);
     }
-    if (m_tqmask != 0) {
-        m_tqmask->setParentLayer(0);
+    if (m_mask != 0) {
+        m_mask->setParentLayer(0);
     }
 }
 
@@ -102,8 +102,8 @@ void KisPaintLayer::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_INT3
 {
     if (m_paintdev && m_paintdev->hasSelection()) {
         m_paintdev->selection()->paintSelection(img, x, y, w, h);
-    } else if (m_tqmask && m_editMask && m_tqmask->hasSelection()) {
-        m_tqmask->selection()->paintSelection(img, x, y, w, h);
+    } else if (m_mask && m_editMask && m_mask->hasSelection()) {
+        m_mask->selection()->paintSelection(img, x, y, w, h);
     }
 }
 
@@ -111,8 +111,8 @@ void KisPaintLayer::paintSelection(TQImage &img, const TQRect& scaledImageRect,
 {
     if (m_paintdev && m_paintdev->hasSelection()) {
         m_paintdev->selection()->paintSelection(img, scaledImageRect, scaledImageSize, imageSize);
-    } else if (m_tqmask && m_editMask && m_tqmask->hasSelection()) {
-        m_tqmask->selection()->paintSelection(img, scaledImageRect, scaledImageSize, imageSize);
+    } else if (m_mask && m_editMask && m_mask->hasSelection()) {
+        m_mask->selection()->paintSelection(img, scaledImageRect, scaledImageSize, imageSize);
     }
 }
 
@@ -191,15 +191,15 @@ void KisPaintLayer::removeMask() {
     if (!hasMask())
         return;
 
-    m_tqmask->setParentLayer(0);
-    m_tqmask = 0;
+    m_mask->setParentLayer(0);
+    m_mask = 0;
     m_maskAsSelection = 0;
     setDirty();
 
     emit sigMaskInfoChanged();
 }
 
-// ### XXX Do we apply the tqmask outside the image boundaries too? I'd say no, but I'm not sure
+// ### XXX Do we apply the mask outside the image boundaries too? I'd say no, but I'm not sure
 void KisPaintLayer::applyMask() {
     if (!hasMask())
         return;
@@ -221,18 +221,18 @@ void KisPaintLayer::applyMask() {
 
 KisPaintDeviceSP KisPaintLayer::createMask() {
     if (hasMask())
-        return m_tqmask;
+        return m_mask;
 
     kdDebug() << k_funcinfo << endl;
     // Grey8 nicely fits our needs of being intuitively comparable to other apps'
-    // tqmask layer interfaces. It does have an alpha component though, which is a bit
+    // mask layer interfaces. It does have an alpha component though, which is a bit
     // less appropriate in this context.
-    m_tqmask = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry()
+    m_mask = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry()
             ->getColorSpace(KisID("GRAYA"), 0));
 
     genericMaskCreationHelper();
 
-    return m_tqmask;
+    return m_mask;
 }
 
 // FIXME If from is a paint device is not grey8!!
@@ -241,22 +241,22 @@ void KisPaintLayer::createMaskFromPaintDevice(KisPaintDeviceSP from) {
         return; // Or overwrite? XXX
 
     kdDebug() << k_funcinfo << endl;
-    m_tqmask = from; // KisPaintDevice(*from); XXX
+    m_mask = from; // KisPaintDevice(*from); XXX
 
     genericMaskCreationHelper();
 }
 
 void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) {
     kdDebug() << k_funcinfo << endl;
-    m_tqmask = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry()
+    m_mask = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry()
             ->getColorSpace(KisID("GRAYA"), 0));
-    m_tqmask->setParentLayer(this);
+    m_mask->setParentLayer(this);
 
     m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough
 
-    // Default pixel is opaque white == don't tqmask?
+    // Default pixel is opaque white == don't mask?
     TQ_UINT8 const defPixel[] = { 255, 255 };
-    m_tqmask->dataManager()->setDefaultPixel(defPixel);
+    m_mask->dataManager()->setDefaultPixel(defPixel);
 
     if (from) {
         TQRect r(extent());
@@ -265,7 +265,7 @@ void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) {
         int h = r.height();
         for (int y = r.y(); y < h; y++) {
             KisHLineIteratorPixel srcIt = from->createHLineIterator(r.x(), y, w, false);
-            KisHLineIteratorPixel dstIt = m_tqmask->createHLineIterator(r.x(), y, w, true);
+            KisHLineIteratorPixel dstIt = m_mask->createHLineIterator(r.x(), y, w, true);
 
             while(!dstIt.isDone()) {
                 // XXX same remark as in convertMaskToSelection
@@ -286,7 +286,7 @@ void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) {
 KisPaintDeviceSP KisPaintLayer::getMask() {
     createMask();
     kdDebug() << k_funcinfo << endl;
-    return m_tqmask;
+    return m_mask;
 }
 
 KisSelectionSP KisPaintLayer::getMaskAsSelection() {
@@ -310,7 +310,7 @@ void KisPaintLayer::setRenderMask(bool b) {
 }
 
 void KisPaintLayer::convertMaskToSelection(const TQRect& r) {
-    KisRectIteratorPixel srcIt = m_tqmask->createRectIterator(r.x(), r.y(),
+    KisRectIteratorPixel srcIt = m_mask->createRectIterator(r.x(), r.y(),
             r.width(), r.height(), false);
     KisRectIteratorPixel dstIt = m_maskAsSelection->createRectIterator(r.x(), r.y(),
             r.width(), r.height(), true);
@@ -326,13 +326,13 @@ void KisPaintLayer::convertMaskToSelection(const TQRect& r) {
 }
 
 void KisPaintLayer::genericMaskCreationHelper() {
-    m_tqmask->setParentLayer(this);
+    m_mask->setParentLayer(this);
 
     m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough
 
-    // Default pixel is opaque white == don't tqmask?
+    // Default pixel is opaque white == don't mask?
     TQ_UINT8 const defPixel[] = { 255, 255 };
-    m_tqmask->dataManager()->setDefaultPixel(defPixel);
+    m_mask->dataManager()->setDefaultPixel(defPixel);
 
     setDirty();
     emit sigMaskInfoChanged();
@@ -355,16 +355,16 @@ namespace {
     class KisCreateMaskCommand : public KNamedCommand {
         typedef KNamedCommand super;
         KisPaintLayerSP m_layer;
-        KisPaintDeviceSP m_tqmask;
+        KisPaintDeviceSP m_mask;
     public:
         KisCreateMaskCommand(const TQString& name, KisPaintLayer* layer)
             : super(name), m_layer(layer) {}
         virtual void execute() {
             kdDebug() << k_funcinfo << endl;
-            if (!m_tqmask)
-                m_tqmask = m_layer->createMask();
+            if (!m_mask)
+                m_mask = m_layer->createMask();
             else
-                m_layer->createMaskFromPaintDevice(m_tqmask);
+                m_layer->createMaskFromPaintDevice(m_mask);
         }
         virtual void unexecute() {
             m_layer->removeMask();
@@ -411,12 +411,12 @@ namespace {
     class KisMaskToSelectionCommand : public KNamedCommand {
         typedef KNamedCommand super;
         KisPaintLayerSP m_layer;
-        KisPaintDeviceSP m_tqmask;
+        KisPaintDeviceSP m_mask;
         KisSelectionSP m_selection;
     public:
         KisMaskToSelectionCommand(const TQString& name, KisPaintLayer* layer)
             : super(name), m_layer(layer) {
-            m_tqmask = m_layer->getMask();
+            m_mask = m_layer->getMask();
             if (m_layer->paintDevice()->hasSelection())
                 m_selection = m_layer->paintDevice()->selection();
             else
@@ -431,18 +431,18 @@ namespace {
                 m_layer->paintDevice()->setSelection(m_selection);
             else
                 m_layer->paintDevice()->deselect();
-            m_layer->createMaskFromPaintDevice(m_tqmask);
+            m_layer->createMaskFromPaintDevice(m_mask);
         }
     };
 
     class KisRemoveMaskCommand : public KNamedCommand {
         typedef KNamedCommand super;
         KisPaintLayerSP m_layer;
-        KisPaintDeviceSP m_tqmask;
+        KisPaintDeviceSP m_mask;
     public:
         KisRemoveMaskCommand(const TQString& name, KisPaintLayer* layer)
             : super(name), m_layer(layer) {
-            m_tqmask = m_layer->getMask();
+            m_mask = m_layer->getMask();
         }
         virtual void execute() {
             kdDebug() << k_funcinfo << endl;
@@ -451,19 +451,19 @@ namespace {
         virtual void unexecute() {
             // I hope that if the undo stack unwinds, it will end up here in the right
             // state again; taking a deep-copy sounds like wasteful to me
-            m_layer->createMaskFromPaintDevice(m_tqmask);
+            m_layer->createMaskFromPaintDevice(m_mask);
         }
     };
 
     class KisApplyMaskCommand : public KNamedCommand {
         typedef KNamedCommand super;
         KisPaintLayerSP m_layer;
-        KisPaintDeviceSP m_tqmask;
+        KisPaintDeviceSP m_mask;
         KisPaintDeviceSP m_original;
     public:
         KisApplyMaskCommand(const TQString& name, KisPaintLayer* layer)
             : super(name), m_layer(layer) {
-            m_tqmask = m_layer->getMask();
+            m_mask = m_layer->getMask();
             m_original = new KisPaintDevice(*m_layer->paintDevice());
         }
         virtual void execute() {
@@ -479,7 +479,7 @@ namespace {
             gc.bitBlt(x, y, COMPOSITE_COPY, m_original, OPACITY_OPAQUE, x, y, w, h);
             gc.end();
 
-            m_layer->createMaskFromPaintDevice(m_tqmask);
+            m_layer->createMaskFromPaintDevice(m_mask);
         }
     };
 }
diff --git a/chalk/core/kis_paint_layer.h b/chalk/core/kis_paint_layer.h
index 6319f9815..2cbd5e488 100644
--- a/chalk/core/kis_paint_layer.h
+++ b/chalk/core/kis_paint_layer.h
@@ -73,55 +73,55 @@ public:
 
     inline KisPaintDeviceSP paintDevice() const { return m_paintdev; }
 
-    /// Returns the paintDevice that accompanies this layer (or tqmask, see editMask)
+    /// Returns the paintDevice that accompanies this layer (or mask, see editMask)
     inline KisPaintDeviceSP paintDeviceOrMask() const {
         if (hasMask() && editMask())
-            return m_tqmask;
+            return m_mask;
         return m_paintdev;
     }
 
     // Mask Layer
 
-    /// Does this layer have a layer tqmask?
-    bool hasMask() const { return m_tqmask != 0; }
+    /// Does this layer have a layer mask?
+    bool hasMask() const { return m_mask != 0; }
     // XXX TODO: Make these undo-able!
-    /// Create a tqmask if it does not yet exist, and return it
+    /// Create a mask if it does not yet exist, and return it
     KisPaintDeviceSP createMask();
-    /// Convert the from argument to the tqmask
+    /// Convert the from argument to the mask
     void createMaskFromPaintDevice(KisPaintDeviceSP from);
     /**
      * Convert the from selection to a paint device (should convert the getMaskAsSelection
-     * result back to the tqmask). Overwrites the current tqmask, if any. Also removes the selection
+     * result back to the mask). Overwrites the current mask, if any. Also removes the selection
      */
     void createMaskFromSelection(KisSelectionSP from);
-    /// Remove the layer tqmask
+    /// Remove the layer mask
     void removeMask();
-    /// Apply the layer tqmask to the paint device, this removes the tqmask afterwards
+    /// Apply the layer mask to the paint device, this removes the mask afterwards
     void applyMask();
-    /// Returns the layer tqmask's device. Creates one if there is currently none
+    /// Returns the layer mask's device. Creates one if there is currently none
     KisPaintDeviceSP getMask();
-    /// Returns the layer tqmask's device, converted to a selection. Creates one if there is currently none
+    /// Returns the layer mask's device, converted to a selection. Creates one if there is currently none
     KisSelectionSP getMaskAsSelection();
 
     /// Undoable version of createMask
     KNamedCommand* createMaskCommand();
     /// Undoable version of createMaskFromSelection
     KNamedCommand* maskFromSelectionCommand();
-    /// Undoable, removes the current tqmask, but converts it to the current selection
+    /// Undoable, removes the current mask, but converts it to the current selection
     KNamedCommand* maskToSelectionCommand();
     /// Undoable version of removeMask
     KNamedCommand* removeMaskCommand();
     /// Undoable version of applyMask
     KNamedCommand* applyMaskCommand();
 
-    /// Returns true if the masked part of the tqmask will be rendered instead of being transparent
+    /// Returns true if the masked part of the mask will be rendered instead of being transparent
     bool renderMask() const { return m_renderMask; }
     /// Set the renderMask property
     void setRenderMask(bool b);
 
     /**
      * When this returns true, the KisPaintDevice returned in paintDevice will actually
-     * be the layer tqmask (if there is one). This is so that tools can draw on the tqmask
+     * be the layer mask (if there is one). This is so that tools can draw on the mask
      * without needing to know its existance.
      */
     bool editMask() const { return m_editMask; }
@@ -136,17 +136,17 @@ public:
     // KisLayerSupportsIndirectPainting
     virtual KisLayer* layer() { return this; }
 signals:
-    /// When the tqmask is created/destroyed or the edittqmask or rendertqmask is changed
+    /// When the mask is created/destroyed or the editmask or rendermask is changed
     void sigMaskInfoChanged();
 
 private:
     void convertMaskToSelection(const TQRect& r);
     void genericMaskCreationHelper();
     KisPaintDeviceSP m_paintdev;
-    // Layer tqmask related:
+    // Layer mask related:
     // XXX It would be nice to merge the next 2 devices...
-    KisPaintDeviceSP m_tqmask; // The tqmask that we can edit and display easily
-    KisSelectionSP m_maskAsSelection; // The tqmask as selection, to apply and render easily
+    KisPaintDeviceSP m_mask; // The mask that we can edit and display easily
+    KisSelectionSP m_maskAsSelection; // The mask as selection, to apply and render easily
     bool m_renderMask;
     bool m_editMask;
 };
diff --git a/chalk/core/kis_painter.cc b/chalk/core/kis_painter.cc
index b83539189..c64935fc7 100644
--- a/chalk/core/kis_painter.cc
+++ b/chalk/core/kis_painter.cc
@@ -812,7 +812,7 @@ void KisPainter::fillPolygon(const vKisPoint& points, FillStyle fillStyle)
     }
 
     // Fill the polygon bounding rectangle with the required contents then we'll
-    // create a tqmask for the actual polygon coverage.
+    // create a mask for the actual polygon coverage.
 
     KisPaintDeviceSP polygon = new KisPaintDevice(m_device->colorSpace(), "polygon");
     Q_CHECK_PTR(polygon);
diff --git a/chalk/core/kis_painter.h b/chalk/core/kis_painter.h
index abfd8b17e..9ca623f6b 100644
--- a/chalk/core/kis_painter.h
+++ b/chalk/core/kis_painter.h
@@ -123,7 +123,7 @@ public:
                 TQ_INT32 sw, TQ_INT32 sh);
 
     /**
-     * A version of bitBlt that renders using an external tqmask, ignoring
+     * A version of bitBlt that renders using an external mask, ignoring
      * the src device's own selection, if it has one.
      */
     void bltMask(TQ_INT32 dx, TQ_INT32 dy,
@@ -135,7 +135,7 @@ public:
                       TQ_INT32 sw, TQ_INT32 sh);
 
     /**
-     * A version of bitBlt that renders using an external selection tqmask, ignoring
+     * A version of bitBlt that renders using an external selection mask, ignoring
      * the src device's own selection, if it has one.
      */
     void bltSelection(TQ_INT32 dx, TQ_INT32 dy,
@@ -148,7 +148,7 @@ public:
 
 
     /**
-     * A version of bitBlt that renders using the src device's selection tqmask, if it has one.
+     * A version of bitBlt that renders using the src device's selection mask, if it has one.
      */
     void bltSelection(TQ_INT32 dx, TQ_INT32 dy,
                       const KisCompositeOp &op,
diff --git a/chalk/core/kis_paintop.cc b/chalk/core/kis_paintop.cc
index bff50cf5f..edb9faf64 100644
--- a/chalk/core/kis_paintop.cc
+++ b/chalk/core/kis_paintop.cc
@@ -42,11 +42,11 @@ KisPaintOp::~KisPaintOp()
 {
 }
 
-KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask) {
-    return computeDab(tqmask, m_painter->device()->colorSpace());
+KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP mask) {
+    return computeDab(mask, m_painter->device()->colorSpace());
 }
 
-KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs)
+KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP mask, KisColorSpace *cs)
 {
     // XXX: According to the SeaShore source, the Gimp uses a
     // temporary layer the size of the layer that is being painted
@@ -65,8 +65,8 @@ KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs
 
     TQ_INT32 pixelSize = colorSpace->pixelSize();
 
-    TQ_INT32 maskWidth = tqmask->width();
-    TQ_INT32 maskHeight = tqmask->height();
+    TQ_INT32 maskWidth = mask->width();
+    TQ_INT32 maskHeight = mask->height();
 
     // Convert the kiscolor to the right colorspace.
     kc.convertTo(colorSpace);
@@ -77,8 +77,8 @@ KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs
         int x=0;
         while(! hiter.isDone())
         {
-            // XXX: Set tqmask
-            colorSpace->setAlpha(kc.data(), tqmask->alphaAt(x++, y), 1);
+            // XXX: Set mask
+            colorSpace->setAlpha(kc.data(), mask->alphaAt(x++, y), 1);
             memcpy(hiter.rawData(), kc.data(), pixelSize);
             ++hiter;
         }
@@ -110,4 +110,4 @@ void KisPaintOp::setSource(KisPaintDeviceSP p) {
 }
 
 
-KisPaintOpSettings* KisPaintOpFactory::settings(TQWidget* /*tqparent*/, const KisInputDevice& /*inputDevice*/) { return 0; }
+KisPaintOpSettings* KisPaintOpFactory::settings(TQWidget* /*parent*/, const KisInputDevice& /*inputDevice*/) { return 0; }
diff --git a/chalk/core/kis_paintop.h b/chalk/core/kis_paintop.h
index 8e8587eab..668856f7c 100644
--- a/chalk/core/kis_paintop.h
+++ b/chalk/core/kis_paintop.h
@@ -79,8 +79,8 @@ public:
 
 protected:
 
-    virtual KisPaintDeviceSP computeDab(KisAlphaMaskSP tqmask);
-    virtual KisPaintDeviceSP computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs);
+    virtual KisPaintDeviceSP computeDab(KisAlphaMaskSP mask);
+    virtual KisPaintDeviceSP computeDab(KisAlphaMaskSP mask, KisColorSpace *cs);
 
 
     /**
@@ -97,7 +97,7 @@ private:
 class KisPaintOpSettings {
 
 public:
-    KisPaintOpSettings(TQWidget *tqparent) { Q_UNUSED(tqparent); }
+    KisPaintOpSettings(TQWidget *parent) { Q_UNUSED(parent); }
     virtual ~KisPaintOpSettings() {}
 
     virtual TQWidget *widget() const { return 0; }
@@ -135,7 +135,7 @@ public:
      * specified input device. Return 0 if there are no settings available for the given
      * device.
      */
-    virtual KisPaintOpSettings* settings(TQWidget* tqparent, const KisInputDevice& inputDevice);
+    virtual KisPaintOpSettings* settings(TQWidget* parent, const KisInputDevice& inputDevice);
 
 };
 #endif // KIS_PAINTOP_H_
diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc
index 3651f35da..012f20275 100644
--- a/chalk/core/kis_paintop_registry.cc
+++ b/chalk/core/kis_paintop_registry.cc
@@ -103,11 +103,11 @@ KisPaintOp * KisPaintOpRegistry::paintOp(const TQString & id, const KisPaintOpSe
     return paintOp(KisID(id, ""), settings, painter);
 }
 
-KisPaintOpSettings * KisPaintOpRegistry::settings(const KisID& id, TQWidget * tqparent, const KisInputDevice& inputDevice) const
+KisPaintOpSettings * KisPaintOpRegistry::settings(const KisID& id, TQWidget * parent, const KisInputDevice& inputDevice) const
 {
     KisPaintOpFactory* f = get(id);
     if (f)
-        return f->settings( tqparent, inputDevice );
+        return f->settings( parent, inputDevice );
 
     return 0;
 }
diff --git a/chalk/core/kis_paintop_registry.h b/chalk/core/kis_paintop_registry.h
index c61105b65..338b9f01e 100644
--- a/chalk/core/kis_paintop_registry.h
+++ b/chalk/core/kis_paintop_registry.h
@@ -56,10 +56,10 @@ public:
     /**
      * Create and return an (abstracted) configuration widget
      * for using the specified paintop with the specified input device,
-     * with the specified tqparent as widget tqparent. Returns 0 if there
+     * with the specified parent as widget parent. Returns 0 if there
      * are no settings available for the given device.
      */
-    KisPaintOpSettings * settings(const KisID& id, TQWidget * tqparent, const KisInputDevice& inputDevice) const;
+    KisPaintOpSettings * settings(const KisID& id, TQWidget * parent, const KisInputDevice& inputDevice) const;
     
     // Whether we should show this paintop in the toolchest
     bool userVisible(const KisID & id, KisColorSpace* cs) const;
diff --git a/chalk/core/kis_random_accessor.h b/chalk/core/kis_random_accessor.h
index 6e2e10ad9..62d90e049 100644
--- a/chalk/core/kis_random_accessor.h
+++ b/chalk/core/kis_random_accessor.h
@@ -68,7 +68,7 @@ class KisRandomAccessorPixelTrait {
         };
 
         /**
-         * Returns the selectiontqmask from the current point; this is guaranteed
+         * Returns the selectionmask from the current point; this is guaranteed
          * to have the same number of consecutive pixels that the iterator has
          * at a given point. It return a 0 if there is no selection.
          */
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc
index b5cd8e6ee..03d766162 100644
--- a/chalk/core/kis_selection.cc
+++ b/chalk/core/kis_selection.cc
@@ -81,7 +81,7 @@ void KisSelection::setSelected(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 s)
 
 TQImage KisSelection::maskImage()
 {
-    // If part of a KisAdjustmentLayer, there may be no tqparent device.
+    // If part of a KisAdjustmentLayer, there may be no parent device.
     TQImage img;
     TQRect bounds;
     if (m_parentPaintDevice) {
diff --git a/chalk/core/kis_selection.h b/chalk/core/kis_selection.h
index d53233376..ae21e696c 100644
--- a/chalk/core/kis_selection.h
+++ b/chalk/core/kis_selection.h
@@ -47,13 +47,13 @@ class KRITACORE_EXPORT KisSelection : public KisPaintDevice {
 public:
     /**
      * Create a new KisSelection
-    * @param dev the tqparent paint device. The selection will never be bigger than the tqparent
+    * @param dev the parent paint device. The selection will never be bigger than the parent
      *              paint device.
      */
     KisSelection(KisPaintDeviceSP dev);
 
     /**
-     * Create a new KisSelection. This selection will not have a tqparent paint device.
+     * Create a new KisSelection. This selection will not have a parent paint device.
      */
     KisSelection();
     
@@ -108,7 +108,7 @@ public:
     void startCachingExactRect();
     void stopCachingExactRect();
 
-    // if the tqparent layer is interested in keeping up to date with the dirtyness
+    // if the parent layer is interested in keeping up to date with the dirtyness
     // of this layer, set to true
     void setInterestedInDirtyness(bool b) { m_dirty = b; }
     bool interestedInDirtyness() const { return m_dirty; }
diff --git a/chalk/doc/DESIGN.obsolete b/chalk/doc/DESIGN.obsolete
index 520d4058d..10ab8dbb6 100644
--- a/chalk/doc/DESIGN.obsolete
+++ b/chalk/doc/DESIGN.obsolete
@@ -67,7 +67,7 @@ Design Patterns
 
             * Addition of kis_types. Defines shared pointer pointers
               to core chalk objects: image, paintdevice, channel,
-              tqmask, layer etc.
+              mask, layer etc.
              
             * Tile architecture. There's Mediator and a Singleton
               pattern here at least. This stuff seems to work, doesn't
@@ -141,7 +141,7 @@ Obsolete files
     core/helper/kis_timer
     core/helper/kis_scopedlock (Replaced with QMutexlocker)
     core/kis_krayon (was predecessor of kis_resource)
-    core/kis_tqmask
+    core/kis_mask
     core/kis_util
     ui/kis_krayon_widget
 
@@ -151,7 +151,7 @@ Random head-scratchings
        - Why the QUANTUM redefinition: the number of bits per channel,
          8 for 32-bit colour, 16 for 64-bit colour.
 
-       - is_tqmask unimplemented? What was it meant to do, or is it an
+       - is_mask unimplemented? What was it meant to do, or is it an
        interface?
 
        - nameserver presents unique numbers for new layers and images.
diff --git a/chalk/doc/brush.txt b/chalk/doc/brush.txt
index 739194c7a..e2373258f 100644
--- a/chalk/doc/brush.txt
+++ b/chalk/doc/brush.txt
@@ -13,7 +13,7 @@ sources:
 Chalk uses the gimp's brush file formats: .gbr and .gih, for singe
 and pipeline brushes, respectively. These brushes contain one or more
 grayscale or rgba images. If the image is grayscale, the gray image is
-intended to be used as an alpha tqmask: each gray level corresponds to
+intended to be used as an alpha mask: each gray level corresponds to
 a certain alpha level, and when painting the current painting colour
 is composited in the image with this level as its alpha component. The
 image brushes should be masked -- i.e., these are coloured images placed
@@ -25,12 +25,12 @@ partly because I like that better, partly because until very recently
 there was no way of making out the difference between gray and rgb
 brushes because KisBrush didn't remember that bit of data.
 
-Making the initial tqmask of a brush is however by now pretty well done; the next
+Making the initial mask of a brush is however by now pretty well done; the next
 problem is painting with those masks.
 
 Here we have two situations, one easy, one difficult. The easy one is the single
 mouse click. If the user clicks or taps with his stylus, we can composite the 
-tqmask or the image at the pixel position of the mouse click.
+mask or the image at the pixel position of the mouse click.
 
 The difficult situation is drawing a line. This line needs to be antialiased.
 
diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi
index df763e021..36659dab7 100644
--- a/chalk/doc/chalk.xmi
+++ b/chalk/doc/chalk.xmi
@@ -66,7 +66,7 @@
    </UML:Class>
    <UML:Class stereotype="class" visibility="public" xmi.id="44" name="KisBuilderMonitor" >
     <UML:Operation visibility="public" xmi.id="46" type="" name="KisBuilderMonitor" >
-     <UML:Parameter visibility="private" xmi.id="47" value="" type="QObject *" name="tqparent" />
+     <UML:Parameter visibility="private" xmi.id="47" value="" type="QObject *" name="parent" />
      <UML:Parameter visibility="private" xmi.id="48" value="" type="const char *" name="name" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="49" type="void" name="attach" >
@@ -827,12 +827,12 @@ a part of a layer.  Layers form an image." visibility="public" xmi.id="481" name
     <UML:Attribute visibility="private" xmi.id="614" value="" type="KisDoc *" name="m_doc" />
    </UML:Class>
    <UML:Class stereotype="class" visibility="public" xmi.id="624" name="KisAlphaMask" >
-    <UML:Operation comment="Create an alpha tqmask based on the gray values of the
+    <UML:Operation comment="Create an alpha mask based on the gray values of the
 specified QImage. If the QImage is not grayscale, you're
 buggered." visibility="public" xmi.id="629" type="" name="KisAlphaMask" >
      <UML:Parameter visibility="private" xmi.id="630" value="" type="const QImage &amp;" name="img" />
     </UML:Operation>
-    <UML:Operation comment="Create an alpha tqmask based on the gray values of the
+    <UML:Operation comment="Create an alpha mask based on the gray values of the
 specified QImage. If the QImage is not grayscale, you're
 buggered. The QImage is scaled using QImage::smoothScale,
 where the target w and h are computed by taking scale as a
@@ -842,13 +842,13 @@ percentage." visibility="public" xmi.id="631" type="" name="KisAlphaMask" >
     </UML:Operation>
     <UML:Operation comment="@return the alpha value at the specified position.
 Returns QUANTUM OPACITY_TRANSPARENT if the value is
-outside the bounds of the tqmask.
+outside the bounds of the mask.
 XXX: this is, of course, not the best way of masking.
 Better would be to let KisAlphaMask fill a chunk of memory
 with the alpha values at the right position, something like
 void applyMask(QUANTUM *pixeldata, Q_INT32 pixelWidth,
 Q_INT32 alphaPos). That would be fastest, or we could
-provide an iterator over the tqmask, that would be nice, too." visibility="public" xmi.id="634" type="QUANTUM" name="alphaAt" >
+provide an iterator over the mask, that would be nice, too." visibility="public" xmi.id="634" type="QUANTUM" name="alphaAt" >
      <UML:Parameter visibility="private" xmi.id="635" value="" type="Q_INT32" name="x" />
      <UML:Parameter visibility="private" xmi.id="636" value="" type="Q_INT32" name="y" />
     </UML:Operation>
@@ -860,7 +860,7 @@ provide an iterator over the tqmask, that would be nice, too." visibility="publi
     </UML:Operation>
     <UML:Operation comment="@return the number of alpha values in a scanline." visibility="public" xmi.id="641" type="Q_INT32" name="height" />
     <UML:Operation comment="@return the scale factor." visibility="public" xmi.id="642" type="double" name="scale" />
-    <UML:Operation comment="@return the number of lines in the tqmask." visibility="public" xmi.id="643" type="Q_INT32" name="width" />
+    <UML:Operation comment="@return the number of lines in the mask." visibility="public" xmi.id="643" type="Q_INT32" name="width" />
     <UML:Operation visibility="public" xmi.id="644" type="virtual " name="~KisAlphaMask" />
     <UML:Attribute visibility="private" xmi.id="625" value="" type="QValueVector" name="m_data" />
     <UML:Attribute visibility="private" xmi.id="626" value="" type="double" name="m_scale" />
@@ -925,8 +925,8 @@ dcop." visibility="public" xmi.id="645" name="KRayonViewIface" >
     <UML:Operation visibility="public" xmi.id="702" type=TQPOINT_OBJECT_NAME_STRING name="hotSpot" />
     <UML:Operation visibility="public" xmi.id="703" type="virtual QImage" name="img" />
     <UML:Operation visibility="public" xmi.id="704" type="virtual bool" name="loadAsync" />
-    <UML:Operation comment="@return a tqmask computed from the grey-level values of the
-pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMask *" name="tqmask" >
+    <UML:Operation comment="@return a mask computed from the grey-level values of the
+pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMask *" name="mask" >
      <UML:Parameter visibility="private" xmi.id="706" value="" type="Q_INT32" name="scale" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="707" type="virtual bool" name="saveAsync" />
@@ -1188,7 +1188,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     <UML:Operation visibility="public" xmi.id="914" type="" name="KisDoc" >
      <UML:Parameter visibility="private" xmi.id="915" value="" type="QWidget *" name="parentWidget" />
      <UML:Parameter visibility="private" xmi.id="916" value="" type="const char *" name="widgetName" />
-     <UML:Parameter visibility="private" xmi.id="917" value="" type="QObject *" name="tqparent" />
+     <UML:Parameter visibility="private" xmi.id="917" value="" type="QObject *" name="parent" />
      <UML:Parameter visibility="private" xmi.id="918" value="" type="const char *" name="name" />
      <UML:Parameter visibility="private" xmi.id="919" value="" type="bool" name="singleViewMode" />
     </UML:Operation>
@@ -1212,7 +1212,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="932" value="" type="KisImageSP" name="img" />
     </UML:Operation>
     <UML:Operation visibility="protected" xmi.id="933" type="virtual KoView *" name="createViewInstance" >
-     <UML:Parameter visibility="private" xmi.id="934" value="" type="QWidget *" name="tqparent" />
+     <UML:Parameter visibility="private" xmi.id="934" value="" type="QWidget *" name="parent" />
      <UML:Parameter visibility="private" xmi.id="935" value="" type="const char *" name="name" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="936" type="virtual DCOPObject *" name="dcopObject" />
@@ -1444,14 +1444,14 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
    </UML:Class>
    <UML:Class stereotype="class" visibility="public" xmi.id="1110" name="KisFactory" >
     <UML:Operation visibility="public" xmi.id="1115" type="" name="KisFactory" >
-     <UML:Parameter visibility="private" xmi.id="1116" value="" type="QObject *" name="tqparent" />
+     <UML:Parameter visibility="private" xmi.id="1116" value="" type="QObject *" name="parent" />
      <UML:Parameter visibility="private" xmi.id="1117" value="" type="const char *" name="name" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1118" type="KAboutData *" name="aboutData" ownerScope="classifier" />
     <UML:Operation visibility="public" xmi.id="1119" type="virtual KParts :: Part *" name="createPartObject" >
      <UML:Parameter visibility="private" xmi.id="1120" value="" type="QWidget *" name="parentWidget" />
      <UML:Parameter visibility="private" xmi.id="1121" value="" type="const char *" name="widgetName" />
-     <UML:Parameter visibility="private" xmi.id="1122" value="" type="QObject *" name="tqparent" />
+     <UML:Parameter visibility="private" xmi.id="1122" value="" type="QObject *" name="parent" />
      <UML:Parameter visibility="private" xmi.id="1123" value="" type="const char *" name="name" />
      <UML:Parameter visibility="private" xmi.id="1124" value="" type="const char *" name="classname" />
      <UML:Parameter visibility="private" xmi.id="1125" value="" type="const QStringList &amp;" name="args" />
@@ -1731,7 +1731,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     <UML:Operation visibility="public" xmi.id="1378" type="bool" name="lower" >
      <UML:Parameter visibility="private" xmi.id="1379" value="" type="KisLayerSP" name="layer" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1380" type="KisChannelSP" name="tqmask" />
+    <UML:Operation visibility="public" xmi.id="1380" type="KisChannelSP" name="mask" />
     <UML:Operation visibility="public" xmi.id="1381" type=TQSTRING_OBJECT_NAME_STRING name="name" />
     <UML:Operation visibility="public" xmi.id="1382" type="enumImgType" name="nativeImgType" />
     <UML:Operation visibility="public" xmi.id="1383" type="Q_INT32" name="nchannels" />
@@ -2088,7 +2088,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1646" type="void" name="addAlpha" />
     <UML:Operation visibility="public" xmi.id="1647" type="KisMaskSP" name="addMask" >
-     <UML:Parameter visibility="private" xmi.id="1648" value="" type="KisMaskSP" name="tqmask" />
+     <UML:Parameter visibility="private" xmi.id="1648" value="" type="KisMaskSP" name="mask" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1649" type="void" name="applyMask" >
      <UML:Parameter visibility="private" xmi.id="1650" value="" type="Q_INT32" name="mode" />
@@ -2100,7 +2100,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Operation visibility="public" xmi.id="1654" type="void" name="linked" >
      <UML:Parameter visibility="private" xmi.id="1655" value="" type="bool" name="l" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1656" type="KisMaskSP" name="tqmask" />
+    <UML:Operation visibility="public" xmi.id="1656" type="KisMaskSP" name="mask" />
     <UML:Operation visibility="public" xmi.id="1657" type="QUANTUM" name="opacity" />
     <UML:Operation visibility="public" xmi.id="1658" type="void" name="setOpacity" >
      <UML:Parameter visibility="private" xmi.id="1659" value="" type="QUANTUM" name="val" />
@@ -2118,7 +2118,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Attribute visibility="private" xmi.id="1622" value="" type="Q_INT32" name="m_dy" />
     <UML:Attribute visibility="private" xmi.id="1623" value="" type="bool" name="m_initial" />
     <UML:Attribute visibility="private" xmi.id="1624" value="" type="bool" name="m_linked" />
-    <UML:Attribute visibility="private" xmi.id="1625" value="" type="KisMaskSP" name="m_tqmask" />
+    <UML:Attribute visibility="private" xmi.id="1625" value="" type="KisMaskSP" name="m_mask" />
     <UML:Attribute visibility="private" xmi.id="1626" value="" type="QUANTUM" name="m_opacity" />
     <UML:Attribute visibility="private" xmi.id="1627" value="" type="bool" name="m_preserveTransparency" />
    </UML:Class>
@@ -2208,7 +2208,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1731" type="Q_INT32" name="apply" />
     <UML:Operation visibility="public" xmi.id="1732" type="void" name="apply" >
-     <UML:Parameter visibility="private" xmi.id="1733" value="" type="Q_INT32" name="tqmask" />
+     <UML:Parameter visibility="private" xmi.id="1733" value="" type="Q_INT32" name="mask" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1734" type="bool" name="edit" />
     <UML:Operation visibility="public" xmi.id="1735" type="void" name="edit" >
@@ -2228,7 +2228,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Operation visibility="public" xmi.id="1753" type=TQPOINT_OBJECT_NAME_STRING name="hotSpot" />
     <UML:Operation comment="@return the next image in the pipe." visibility="public" xmi.id="1754" type="virtual QImage" name="img" />
     <UML:Operation visibility="public" xmi.id="1755" type="virtual bool" name="loadAsync" />
-    <UML:Operation comment="@return the next tqmask in the pipe." visibility="public" xmi.id="1756" type="virtual KisAlphaMask *" name="tqmask" >
+    <UML:Operation comment="@return the next mask in the pipe." visibility="public" xmi.id="1756" type="virtual KisAlphaMask *" name="mask" >
      <UML:Parameter visibility="private" xmi.id="1757" value="" type="Q_INT32" name="scale" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1758" type="virtual bool" name="saveAsync" />
@@ -2286,7 +2286,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
      <UML:Parameter visibility="private" xmi.id="1813" value="" type="Q_INT32" name="sh" />
     </UML:Operation>
     <UML:Operation visibility="protected" xmi.id="1814" type="void" name="computeDab" >
-     <UML:Parameter visibility="private" xmi.id="1815" value="" type="KisAlphaMask *" name="tqmask" />
+     <UML:Parameter visibility="private" xmi.id="1815" value="" type="KisAlphaMask *" name="mask" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1816" type="KisPaintDeviceSP" name="device" />
     <UML:Operation visibility="public" xmi.id="1817" type="QRect" name="dirtyRect" />
@@ -2411,7 +2411,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
    </UML:Class>
    <UML:Class stereotype="class" visibility="public" xmi.id="1903" name="KisSelection" >
     <UML:Operation visibility="public" xmi.id="1911" type="" name="KisSelection" >
-     <UML:Parameter visibility="private" xmi.id="1912" value="" type="KisPaintDeviceSP" name="tqparent" />
+     <UML:Parameter visibility="private" xmi.id="1912" value="" type="KisPaintDeviceSP" name="parent" />
      <UML:Parameter visibility="private" xmi.id="1913" value="" type="KisImageSP" name="img" />
      <UML:Parameter visibility="private" xmi.id="1914" value="" type="const QString &amp;" name="name" />
      <UML:Parameter visibility="private" xmi.id="1915" value="" type="QUANTUM" name="opacity" />
@@ -2434,7 +2434,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
      <UML:Parameter visibility="private" xmi.id="1928" value="" type="Q_INT32" name="x" />
      <UML:Parameter visibility="private" xmi.id="1929" value="" type="Q_INT32" name="y" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1930" type="KisPaintDeviceSP" name="tqparent" />
+    <UML:Operation visibility="public" xmi.id="1930" type="KisPaintDeviceSP" name="parent" />
     <UML:Operation visibility="public" xmi.id="1931" type="void" name="setBounds" >
      <UML:Parameter visibility="private" xmi.id="1932" value="" type="Q_INT32" name="parentX" />
      <UML:Parameter visibility="private" xmi.id="1933" value="" type="Q_INT32" name="parentY" />
@@ -2445,7 +2445,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
      <UML:Parameter visibility="private" xmi.id="1937" value="" type="const QRect &amp;" name="rc" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1938" type="void" name="setParent" >
-     <UML:Parameter visibility="private" xmi.id="1939" value="" type="KisPaintDeviceSP" name="tqparent" />
+     <UML:Parameter visibility="private" xmi.id="1939" value="" type="KisPaintDeviceSP" name="parent" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1940" type="virtual bool" name="shouldDrawBorder" />
     <UML:Operation visibility="public" xmi.id="1941" type="QImage" name="toImage" />
@@ -2465,7 +2465,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
      <UML:Parameter visibility="private" xmi.id="1950" value="" type="const QString &amp;" name="chooserCaption" />
      <UML:Parameter visibility="private" xmi.id="1951" value="" type="QWidget *" name="chooserParent" />
      <UML:Parameter visibility="private" xmi.id="1952" value="" type="const char *" name="chooserName" />
-     <UML:Parameter visibility="private" xmi.id="1953" value="" type="QObject *" name="tqparent" />
+     <UML:Parameter visibility="private" xmi.id="1953" value="" type="QObject *" name="parent" />
      <UML:Parameter visibility="private" xmi.id="1954" value="" type="const char *" name="name" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1955" type="QWidget *" name="chooserWidget" />
@@ -2735,7 +2735,7 @@ in the constructor, you have to call loadAsync.
      <UML:Parameter visibility="private" xmi.id="2159" value="" type="QMouseEvent *" name="e" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="2160" type="virtual KDialog *" isAbstract="true" name="options" >
-     <UML:Parameter visibility="private" xmi.id="2161" value="" type="QWidget *" name="tqparent" />
+     <UML:Parameter visibility="private" xmi.id="2161" value="" type="QWidget *" name="parent" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="2162" type="virtual void" isAbstract="true" name="paint" >
      <UML:Parameter visibility="private" xmi.id="2163" value="" type="QPainter &amp;" name="gc" />
@@ -2994,7 +2994,7 @@ in the constructor, you have to call loadAsync.
     <UML:Operation visibility="public" xmi.id="2448" type="" name="KisView" >
      <UML:Parameter visibility="private" xmi.id="2449" value="" type="KisDoc *" name="doc" />
      <UML:Parameter visibility="private" xmi.id="2450" value="" type="KisUndoAdapter *" name="adapter" />
-     <UML:Parameter visibility="private" xmi.id="2451" value="" type="QWidget *" name="tqparent" />
+     <UML:Parameter visibility="private" xmi.id="2451" value="" type="QWidget *" name="parent" />
      <UML:Parameter visibility="private" xmi.id="2452" value="" type="const char *" name="name" />
     </UML:Operation>
     <UML:Operation visibility="protected" xmi.id="2453" type="virtual void" name="attach" >
@@ -3218,16 +3218,16 @@ in the constructor, you have to call loadAsync.
    <UML:DataType stereotype="datatype" visibility="public" xmi.id="2570" name="vKisCanvasObserver_it" />
    <UML:DataType stereotype="datatype" visibility="public" xmi.id="2571" name="vKisCanvasObserver" />
    <UML:DataType stereotype="datatype" visibility="public" xmi.id="2572" name="vKisCanvasObserver_cit" />
-   <UML:Generalization child="12" visibility="public" xmi.id="54" tqparent="9" />
+   <UML:Generalization child="12" visibility="public" xmi.id="54" parent="9" />
    <UML:Association visibility="public" xmi.id="194" >
     <UML:Association.connection>
      <UML:AssociationEndRole visibility="public" aggregation="none" type="193" />
      <UML:AssociationEndRole visibility="private" type="193" name="m_singleton" />
     </UML:Association.connection>
    </UML:Association>
-   <UML:Generalization child="81" visibility="public" xmi.id="276" tqparent="139" />
-   <UML:Generalization child="206" visibility="public" xmi.id="277" tqparent="139" />
-   <UML:Generalization child="266" visibility="public" xmi.id="278" tqparent="193" />
+   <UML:Generalization child="81" visibility="public" xmi.id="276" parent="139" />
+   <UML:Generalization child="206" visibility="public" xmi.id="277" parent="139" />
+   <UML:Generalization child="266" visibility="public" xmi.id="278" parent="193" />
    <UML:Association visibility="public" xmi.id="329" >
     <UML:Association.connection>
      <UML:AssociationEndRole visibility="public" aggregation="shared" type="325" />
@@ -3276,9 +3276,9 @@ in the constructor, you have to call loadAsync.
      <UML:AssociationEndRole visibility="private" type="720" name="m_brushType" />
     </UML:Association.connection>
    </UML:Association>
-   <UML:Generalization child="1620" visibility="public" xmi.id="1764" tqparent="1453" />
-   <UML:Generalization child="1722" visibility="public" xmi.id="1765" tqparent="1130" />
-   <UML:Generalization child="1741" visibility="public" xmi.id="1766" tqparent="681" />
+   <UML:Generalization child="1620" visibility="public" xmi.id="1764" parent="1453" />
+   <UML:Generalization child="1722" visibility="public" xmi.id="1765" parent="1130" />
+   <UML:Generalization child="1741" visibility="public" xmi.id="1766" parent="681" />
    <UML:Association visibility="public" xmi.id="1769" >
     <UML:Association.connection>
      <UML:AssociationEndRole visibility="public" aggregation="shared" type="1767" />
@@ -3291,15 +3291,15 @@ in the constructor, you have to call loadAsync.
      <UML:AssociationEndRole visibility="private" type="856" name="m_gradient" />
     </UML:Association.connection>
    </UML:Association>
-   <UML:Generalization child="1903" visibility="public" xmi.id="2127" tqparent="1620" />
-   <UML:Generalization child="2109" visibility="public" xmi.id="2128" tqparent="2047" />
+   <UML:Generalization child="1903" visibility="public" xmi.id="2127" parent="1620" />
+   <UML:Generalization child="2109" visibility="public" xmi.id="2128" parent="2047" />
    <UML:Association visibility="public" xmi.id="2191" >
     <UML:Association.connection>
      <UML:AssociationEndRole visibility="public" aggregation="none" type="2190" />
      <UML:AssociationEndRole visibility="private" type="2190" name="m_singleton" />
     </UML:Association.connection>
    </UML:Association>
-   <UML:Generalization child="2135" visibility="public" xmi.id="2326" tqparent="1101" />
+   <UML:Generalization child="2135" visibility="public" xmi.id="2326" parent="1101" />
    <UML:Association visibility="public" xmi.id="2366" >
     <UML:Association.connection>
      <UML:AssociationEndRole visibility="public" aggregation="shared" type="2365" />
@@ -3354,10 +3354,10 @@ in the constructor, you have to call loadAsync.
      <UML:AssociationEndRole visibility="private" type="2135" name="m_tool" />
     </UML:Association.connection>
    </UML:Association>
-   <UML:Generalization child="2365" visibility="public" xmi.id="2567" tqparent="1170" />
-   <UML:Generalization child="2365" visibility="public" xmi.id="2568" tqparent="750" />
-   <UML:Generalization child="2365" visibility="public" xmi.id="2569" tqparent="2203" />
-   <UML:Generalization child="681" visibility="public" xmi.id="2578" tqparent="2047" />
+   <UML:Generalization child="2365" visibility="public" xmi.id="2567" parent="1170" />
+   <UML:Generalization child="2365" visibility="public" xmi.id="2568" parent="750" />
+   <UML:Generalization child="2365" visibility="public" xmi.id="2569" parent="2203" />
+   <UML:Generalization child="681" visibility="public" xmi.id="2578" parent="2047" />
   </UML:Model>
   <diagrams>
    <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" zoom="75" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1285" snapy="10" showatts="1" xmi.id="1" documentation="" type="402" showops="1" showpackage="0" name="Chalk Core" localid="30000" showstereotype="0" showscope="1" snapcsgrid="1" font="Bitstream Vera Sans,14,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1221" >
@@ -3536,7 +3536,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="702" label="hotSpot" />
       <listitem open="0" type="815" id="703" label="img" />
       <listitem open="0" type="815" id="704" label="loadAsync" />
-      <listitem open="0" type="815" id="705" label="tqmask" />
+      <listitem open="0" type="815" id="705" label="mask" />
       <listitem open="0" type="815" id="707" label="saveAsync" />
       <listitem open="0" type="815" id="708" label="setHotSpot" />
       <listitem open="0" type="815" id="710" label="~KisBrush" />
@@ -3935,7 +3935,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="1375" label="layers" />
       <listitem open="0" type="815" id="1378" label="lower" />
       <listitem open="0" type="815" id="1376" label="lower" />
-      <listitem open="0" type="815" id="1380" label="tqmask" />
+      <listitem open="0" type="815" id="1380" label="mask" />
       <listitem open="0" type="815" id="1381" label="name" />
       <listitem open="0" type="815" id="1382" label="nativeImgType" />
       <listitem open="0" type="815" id="1383" label="nchannels" />
@@ -4008,7 +4008,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="1753" label="hotSpot" />
       <listitem open="0" type="815" id="1754" label="img" />
       <listitem open="0" type="815" id="1755" label="loadAsync" />
-      <listitem open="0" type="815" id="1756" label="tqmask" />
+      <listitem open="0" type="815" id="1756" label="mask" />
       <listitem open="0" type="815" id="1758" label="saveAsync" />
       <listitem open="0" type="815" id="1759" label="setHotSpot" />
       <listitem open="0" type="815" id="1761" label="setParasite" />
@@ -4019,7 +4019,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="814" id="1622" label="m_dy" />
       <listitem open="0" type="814" id="1623" label="m_initial" />
       <listitem open="0" type="814" id="1624" label="m_linked" />
-      <listitem open="0" type="814" id="1625" label="m_tqmask" />
+      <listitem open="0" type="814" id="1625" label="m_mask" />
       <listitem open="0" type="814" id="1626" label="m_opacity" />
       <listitem open="0" type="814" id="1627" label="m_preserveTransparency" />
       <listitem open="0" type="815" id="1644" label="KisLayer" />
@@ -4032,7 +4032,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="1651" label="createMask" />
       <listitem open="0" type="815" id="1654" label="linked" />
       <listitem open="0" type="815" id="1653" label="linked" />
-      <listitem open="0" type="815" id="1656" label="tqmask" />
+      <listitem open="0" type="815" id="1656" label="mask" />
       <listitem open="0" type="815" id="1657" label="opacity" />
       <listitem open="0" type="815" id="1658" label="setOpacity" />
       <listitem open="0" type="815" id="1660" label="translate" />
@@ -4359,7 +4359,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="1924" label="commit" />
       <listitem open="0" type="815" id="1925" label="fromImage" />
       <listitem open="0" type="815" id="1927" label="move" />
-      <listitem open="0" type="815" id="1930" label="tqparent" />
+      <listitem open="0" type="815" id="1930" label="parent" />
       <listitem open="0" type="815" id="1936" label="setBounds" />
       <listitem open="0" type="815" id="1931" label="setBounds" />
       <listitem open="0" type="815" id="1938" label="setParent" />
@@ -8752,7 +8752,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="624" parent_class="624" fileExt=".cpp" fileName="kisalphatqmask" >
+    <classifiercodedocument writeOutCode="true" package="" id="624" parent_class="624" fileExt=".cpp" fileName="kisalphamask" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;double.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;" >
        <header>
@@ -8812,17 +8812,17 @@ in the constructor, you have to call loadAsync.
         </codeaccessormethod>
         <codeoperation parent_id="629" tag="operation_629" canDelete="false" role_id="-1" >
          <header>
-          <cppcodedocumentation tag="" text="Create an alpha tqmask based on the gray values of the&amp;#010;specified QImage. If the QImage is not grayscale, you're&amp;#010;buggered." />
+          <cppcodedocumentation tag="" text="Create an alpha mask based on the gray values of the&amp;#010;specified QImage. If the QImage is not grayscale, you're&amp;#010;buggered." />
          </header>
         </codeoperation>
         <codeoperation parent_id="631" tag="operation_631" canDelete="false" role_id="-1" >
          <header>
-          <cppcodedocumentation tag="" text="Create an alpha tqmask based on the gray values of the&amp;#010;specified QImage. If the QImage is not grayscale, you're&amp;#010;buggered. The QImage is scaled using QImage::smoothScale,&amp;#010;where the target w and h are computed by taking scale as a&amp;#010;percentage." />
+          <cppcodedocumentation tag="" text="Create an alpha mask based on the gray values of the&amp;#010;specified QImage. If the QImage is not grayscale, you're&amp;#010;buggered. The QImage is scaled using QImage::smoothScale,&amp;#010;where the target w and h are computed by taking scale as a&amp;#010;percentage." />
          </header>
         </codeoperation>
         <codeoperation parent_id="634" tag="operation_634" canDelete="false" role_id="-1" >
          <header>
-          <cppcodedocumentation tag="" text="@return the alpha value at the specified position.&amp;#010;Returns QUANTUM OPACITY_TRANSPARENT if the value is&amp;#010;outside the bounds of the tqmask.&amp;#010;XXX: this is, of course, not the best way of masking.&amp;#010;Better would be to let KisAlphaMask fill a chunk of memory&amp;#010;with the alpha values at the right position, something like&amp;#010;void applyMask(QUANTUM *pixeldata, Q_INT32 pixelWidth,&amp;#010;Q_INT32 alphaPos). That would be fastest, or we could&amp;#010;provide an iterator over the tqmask, that would be nice, too." />
+          <cppcodedocumentation tag="" text="@return the alpha value at the specified position.&amp;#010;Returns QUANTUM OPACITY_TRANSPARENT if the value is&amp;#010;outside the bounds of the mask.&amp;#010;XXX: this is, of course, not the best way of masking.&amp;#010;Better would be to let KisAlphaMask fill a chunk of memory&amp;#010;with the alpha values at the right position, something like&amp;#010;void applyMask(QUANTUM *pixeldata, Q_INT32 pixelWidth,&amp;#010;Q_INT32 alphaPos). That would be fastest, or we could&amp;#010;provide an iterator over the mask, that would be nice, too." />
          </header>
         </codeoperation>
         <codeoperation parent_id="637" tag="operation_637" canDelete="false" role_id="-1" >
@@ -8847,7 +8847,7 @@ in the constructor, you have to call loadAsync.
         </codeoperation>
         <codeoperation parent_id="643" tag="operation_643" canDelete="false" role_id="-1" >
          <header>
-          <cppcodedocumentation tag="" text="@return the number of lines in the tqmask." />
+          <cppcodedocumentation tag="" text="@return the number of lines in the mask." />
          </header>
         </codeoperation>
         <codeoperation parent_id="644" tag="operation_644" canDelete="false" role_id="-1" >
@@ -8859,7 +8859,7 @@ in the constructor, you have to call loadAsync.
       </hierarchicalcodeblock>
      </textblocks>
      <header>
-      <codecomment tag="" text="/************************************************************************&amp;#010;  			kisalphatqmask.cpp - Copyright boud&amp;#010;&amp;#010;Here you can write a license for your code, some comments or any other&amp;#010;information you want to have in your generated code. To to this simply&amp;#010;configure the &quot;headings&quot; directory in uml to point to a directory&amp;#010;where you have your heading files.&amp;#010;&amp;#010;or you can just replace the contents of this file with your own.&amp;#010;If you want to do this, this file is located at&amp;#010;&amp;#010;/opt/kde3/share/apps/umbrello/headings/heading.cpp&amp;#010;&amp;#010;-->Code Generators searches for heading files based on the file extension&amp;#010;   i.e. it will look for a file name ending in &quot;.h&quot; to include in C++ header&amp;#010;   files, and for a file name ending in &quot;.java&quot; to include in all generated&amp;#010;   java code.&amp;#010;   If you name the file &quot;heading.&lt;extension>&quot;, Code Generator will always&amp;#010;   choose this file even if there are other files with the same extension in the&amp;#010;   directory. If you name the file something else, it must be the only one with that&amp;#010;   extension in the directory to guarantee that Code Generator will choose it.&amp;#010;&amp;#010;you can use variables in your heading files which are replaced at generation&amp;#010;time. possible variables are : author, date, time, filename and filepath.&amp;#010;just write %variable_name%&amp;#010;&amp;#010;This file was generated on Sun Feb 8 2004 at 16:52:01&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
+      <codecomment tag="" text="/************************************************************************&amp;#010;  			kisalphamask.cpp - Copyright boud&amp;#010;&amp;#010;Here you can write a license for your code, some comments or any other&amp;#010;information you want to have in your generated code. To to this simply&amp;#010;configure the &quot;headings&quot; directory in uml to point to a directory&amp;#010;where you have your heading files.&amp;#010;&amp;#010;or you can just replace the contents of this file with your own.&amp;#010;If you want to do this, this file is located at&amp;#010;&amp;#010;/opt/kde3/share/apps/umbrello/headings/heading.cpp&amp;#010;&amp;#010;-->Code Generators searches for heading files based on the file extension&amp;#010;   i.e. it will look for a file name ending in &quot;.h&quot; to include in C++ header&amp;#010;   files, and for a file name ending in &quot;.java&quot; to include in all generated&amp;#010;   java code.&amp;#010;   If you name the file &quot;heading.&lt;extension>&quot;, Code Generator will always&amp;#010;   choose this file even if there are other files with the same extension in the&amp;#010;   directory. If you name the file something else, it must be the only one with that&amp;#010;   extension in the directory to guarantee that Code Generator will choose it.&amp;#010;&amp;#010;you can use variables in your heading files which are replaced at generation&amp;#010;time. possible variables are : author, date, time, filename and filepath.&amp;#010;just write %variable_name%&amp;#010;&amp;#010;This file was generated on Sun Feb 8 2004 at 16:52:01&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
       <codeclassfield parent_id="625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
@@ -9418,7 +9418,7 @@ in the constructor, you have to call loadAsync.
         </codeoperation>
         <codeoperation parent_id="705" tag="operation_705" canDelete="false" role_id="-1" >
          <header>
-          <cppcodedocumentation tag="" text="@return a tqmask computed from the grey-level values of the&amp;#010;pixels in the brush." />
+          <cppcodedocumentation tag="" text="@return a mask computed from the grey-level values of the&amp;#010;pixels in the brush." />
          </header>
         </codeoperation>
         <codeoperation parent_id="707" tag="operation_707" canDelete="false" role_id="-1" >
@@ -15937,7 +15937,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1722" parent_class="1722" fileExt=".cpp" fileName="kistqmask" >
+    <classifiercodedocument writeOutCode="true" package="" id="1722" parent_class="1722" fileExt=".cpp" fileName="kismask" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;kislayersp.h&quot;&amp;#010;" >
        <header>
@@ -16004,7 +16004,7 @@ in the constructor, you have to call loadAsync.
       </hierarchicalcodeblock>
      </textblocks>
      <header>
-      <codecomment tag="" text="/************************************************************************&amp;#010;  			kistqmask.cpp - Copyright boud&amp;#010;&amp;#010;Here you can write a license for your code, some comments or any other&amp;#010;information you want to have in your generated code. To to this simply&amp;#010;configure the &quot;headings&quot; directory in uml to point to a directory&amp;#010;where you have your heading files.&amp;#010;&amp;#010;or you can just replace the contents of this file with your own.&amp;#010;If you want to do this, this file is located at&amp;#010;&amp;#010;/opt/kde3/share/apps/umbrello/headings/heading.cpp&amp;#010;&amp;#010;-->Code Generators searches for heading files based on the file extension&amp;#010;   i.e. it will look for a file name ending in &quot;.h&quot; to include in C++ header&amp;#010;   files, and for a file name ending in &quot;.java&quot; to include in all generated&amp;#010;   java code.&amp;#010;   If you name the file &quot;heading.&lt;extension>&quot;, Code Generator will always&amp;#010;   choose this file even if there are other files with the same extension in the&amp;#010;   directory. If you name the file something else, it must be the only one with that&amp;#010;   extension in the directory to guarantee that Code Generator will choose it.&amp;#010;&amp;#010;you can use variables in your heading files which are replaced at generation&amp;#010;time. possible variables are : author, date, time, filename and filepath.&amp;#010;just write %variable_name%&amp;#010;&amp;#010;This file was generated on Sun Feb 8 2004 at 16:45:17&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
+      <codecomment tag="" text="/************************************************************************&amp;#010;  			kismask.cpp - Copyright boud&amp;#010;&amp;#010;Here you can write a license for your code, some comments or any other&amp;#010;information you want to have in your generated code. To to this simply&amp;#010;configure the &quot;headings&quot; directory in uml to point to a directory&amp;#010;where you have your heading files.&amp;#010;&amp;#010;or you can just replace the contents of this file with your own.&amp;#010;If you want to do this, this file is located at&amp;#010;&amp;#010;/opt/kde3/share/apps/umbrello/headings/heading.cpp&amp;#010;&amp;#010;-->Code Generators searches for heading files based on the file extension&amp;#010;   i.e. it will look for a file name ending in &quot;.h&quot; to include in C++ header&amp;#010;   files, and for a file name ending in &quot;.java&quot; to include in all generated&amp;#010;   java code.&amp;#010;   If you name the file &quot;heading.&lt;extension>&quot;, Code Generator will always&amp;#010;   choose this file even if there are other files with the same extension in the&amp;#010;   directory. If you name the file something else, it must be the only one with that&amp;#010;   extension in the directory to guarantee that Code Generator will choose it.&amp;#010;&amp;#010;you can use variables in your heading files which are replaced at generation&amp;#010;time. possible variables are : author, date, time, filename and filepath.&amp;#010;just write %variable_name%&amp;#010;&amp;#010;This file was generated on Sun Feb 8 2004 at 16:45:17&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields/>
     </classifiercodedocument>
@@ -16148,7 +16148,7 @@ in the constructor, you have to call loadAsync.
         </codeoperation>
         <codeoperation parent_id="1756" tag="operation_1756" canDelete="false" role_id="-1" >
          <header>
-          <cppcodedocumentation tag="" text="@return the next tqmask in the pipe." />
+          <cppcodedocumentation tag="" text="@return the next mask in the pipe." />
          </header>
         </codeoperation>
         <codeoperation parent_id="1758" tag="operation_1758" canDelete="false" role_id="-1" >
@@ -24174,7 +24174,7 @@ in the constructor, you have to call loadAsync.
                <textblocks>
                 <codeoperation parent_id="46" tag="operation_46" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent &amp;#010;@param name " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parent &amp;#010;@param name " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="49" tag="operation_49" canDelete="false" indentLevel="1" role_id="-1" >
@@ -31756,7 +31756,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader624" parent_class="624" fileExt=".h" fileName="kisalphatqmask" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader624" parent_class="624" fileExt=".h" fileName="kisalphamask" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISALPHAMASK_H&amp;#010;#define KISALPHAMASK_H" >
        <header>
@@ -31842,17 +31842,17 @@ in the constructor, you have to call loadAsync.
                <textblocks>
                 <codeoperation parent_id="629" tag="operation_629" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="Create an alpha tqmask based on the gray values of the&amp;#010;specified QImage. If the QImage is not grayscale, you're&amp;#010;buggered.&amp;#010;@param img " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="Create an alpha mask based on the gray values of the&amp;#010;specified QImage. If the QImage is not grayscale, you're&amp;#010;buggered.&amp;#010;@param img " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="631" tag="operation_631" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="Create an alpha tqmask based on the gray values of the&amp;#010;specified QImage. If the QImage is not grayscale, you're&amp;#010;buggered. The QImage is scaled using QImage::smoothScale,&amp;#010;where the target w and h are computed by taking scale as a&amp;#010;percentage.&amp;#010;@param img &amp;#010;@param scale " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="Create an alpha mask based on the gray values of the&amp;#010;specified QImage. If the QImage is not grayscale, you're&amp;#010;buggered. The QImage is scaled using QImage::smoothScale,&amp;#010;where the target w and h are computed by taking scale as a&amp;#010;percentage.&amp;#010;@param img &amp;#010;@param scale " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="634" tag="operation_634" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="@return the alpha value at the specified position.&amp;#010;Returns QUANTUM OPACITY_TRANSPARENT if the value is&amp;#010;outside the bounds of the tqmask.&amp;#010;XXX: this is, of course, not the best way of masking.&amp;#010;Better would be to let KisAlphaMask fill a chunk of memory&amp;#010;with the alpha values at the right position, something like&amp;#010;void applyMask(QUANTUM *pixeldata, Q_INT32 pixelWidth,&amp;#010;Q_INT32 alphaPos). That would be fastest, or we could&amp;#010;provide an iterator over the tqmask, that would be nice, too.&amp;#010;@param x &amp;#010;@param y " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="@return the alpha value at the specified position.&amp;#010;Returns QUANTUM OPACITY_TRANSPARENT if the value is&amp;#010;outside the bounds of the mask.&amp;#010;XXX: this is, of course, not the best way of masking.&amp;#010;Better would be to let KisAlphaMask fill a chunk of memory&amp;#010;with the alpha values at the right position, something like&amp;#010;void applyMask(QUANTUM *pixeldata, Q_INT32 pixelWidth,&amp;#010;Q_INT32 alphaPos). That would be fastest, or we could&amp;#010;provide an iterator over the mask, that would be nice, too.&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="641" tag="operation_641" canDelete="false" indentLevel="1" role_id="-1" >
@@ -31867,7 +31867,7 @@ in the constructor, you have to call loadAsync.
                 </codeoperation>
                 <codeoperation parent_id="643" tag="operation_643" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="@return the number of lines in the tqmask." />
+                  <cppcodedocumentation tag="" indentLevel="1" text="@return the number of lines in the mask." />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="644" tag="operation_644" canDelete="false" indentLevel="1" role_id="-1" >
@@ -32067,7 +32067,7 @@ in the constructor, you have to call loadAsync.
       </codeblockwithcomments>
      </textblocks>
      <header>
-      <codecomment tag="" text="/************************************************************************&amp;#010;  			kisalphatqmask.h - Copyright boud&amp;#010;&amp;#010;Here you can write a license for your code, some comments or any other&amp;#010;information you want to have in your generated code. To to this simply&amp;#010;configure the &quot;headings&quot; directory in uml to point to a directory&amp;#010;where you have your heading files.&amp;#010;&amp;#010;or you can just replace the contents of this file with your own.&amp;#010;If you want to do this, this file is located at&amp;#010;&amp;#010;/opt/kde3/share/apps/umbrello/headings/heading.h&amp;#010;&amp;#010;-->Code Generators searches for heading files based on the file extension&amp;#010;   i.e. it will look for a file name ending in &quot;.h&quot; to include in C++ header&amp;#010;   files, and for a file name ending in &quot;.java&quot; to include in all generated&amp;#010;   java code.&amp;#010;   If you name the file &quot;heading.&lt;extension>&quot;, Code Generator will always&amp;#010;   choose this file even if there are other files with the same extension in the&amp;#010;   directory. If you name the file something else, it must be the only one with that&amp;#010;   extension in the directory to guarantee that Code Generator will choose it.&amp;#010;&amp;#010;you can use variables in your heading files which are replaced at generation&amp;#010;time. possible variables are : author, date, time, filename and filepath.&amp;#010;just write %variable_name%&amp;#010;&amp;#010;This file was generated on Sun Feb 8 2004 at 16:52:01&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
+      <codecomment tag="" text="/************************************************************************&amp;#010;  			kisalphamask.h - Copyright boud&amp;#010;&amp;#010;Here you can write a license for your code, some comments or any other&amp;#010;information you want to have in your generated code. To to this simply&amp;#010;configure the &quot;headings&quot; directory in uml to point to a directory&amp;#010;where you have your heading files.&amp;#010;&amp;#010;or you can just replace the contents of this file with your own.&amp;#010;If you want to do this, this file is located at&amp;#010;&amp;#010;/opt/kde3/share/apps/umbrello/headings/heading.h&amp;#010;&amp;#010;-->Code Generators searches for heading files based on the file extension&amp;#010;   i.e. it will look for a file name ending in &quot;.h&quot; to include in C++ header&amp;#010;   files, and for a file name ending in &quot;.java&quot; to include in all generated&amp;#010;   java code.&amp;#010;   If you name the file &quot;heading.&lt;extension>&quot;, Code Generator will always&amp;#010;   choose this file even if there are other files with the same extension in the&amp;#010;   directory. If you name the file something else, it must be the only one with that&amp;#010;   extension in the directory to guarantee that Code Generator will choose it.&amp;#010;&amp;#010;you can use variables in your heading files which are replaced at generation&amp;#010;time. possible variables are : author, date, time, filename and filepath.&amp;#010;just write %variable_name%&amp;#010;&amp;#010;This file was generated on Sun Feb 8 2004 at 16:52:01&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
       <codeclassfield parent_id="625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
@@ -32965,7 +32965,7 @@ in the constructor, you have to call loadAsync.
                 </codeoperation>
                 <codeoperation parent_id="705" tag="operation_705" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="@return a tqmask computed from the grey-level values of the&amp;#010;pixels in the brush.&amp;#010;@param scale " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="@return a mask computed from the grey-level values of the&amp;#010;pixels in the brush.&amp;#010;@param scale " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="707" tag="operation_707" canDelete="false" indentLevel="1" role_id="-1" >
@@ -36508,7 +36508,7 @@ in the constructor, you have to call loadAsync.
                <textblocks>
                 <codeoperation parent_id="914" tag="operation_914" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parentWidget &amp;#010;@param widgetName &amp;#010;@param tqparent &amp;#010;@param name &amp;#010;@param singleViewMode " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parentWidget &amp;#010;@param widgetName &amp;#010;@param parent &amp;#010;@param name &amp;#010;@param singleViewMode " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="922" tag="operation_922" canDelete="false" indentLevel="1" role_id="-1" >
@@ -36790,7 +36790,7 @@ in the constructor, you have to call loadAsync.
                 </codeoperation>
                 <codeoperation parent_id="933" tag="operation_933" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent &amp;#010;@param name " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parent &amp;#010;@param name " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="938" tag="operation_938" canDelete="false" indentLevel="1" role_id="-1" >
@@ -38310,7 +38310,7 @@ in the constructor, you have to call loadAsync.
                <textblocks>
                 <codeoperation parent_id="1115" tag="operation_1115" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent &amp;#010;@param name " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parent &amp;#010;@param name " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1118" tag="operation_1118" canDelete="false" indentLevel="1" role_id="-1" >
@@ -38320,7 +38320,7 @@ in the constructor, you have to call loadAsync.
                 </codeoperation>
                 <codeoperation parent_id="1119" tag="operation_1119" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parentWidget &amp;#010;@param widgetName &amp;#010;@param tqparent &amp;#010;@param name &amp;#010;@param classname &amp;#010;@param args " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parentWidget &amp;#010;@param widgetName &amp;#010;@param parent &amp;#010;@param name &amp;#010;@param classname &amp;#010;@param args " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1126" tag="operation_1126" canDelete="false" indentLevel="1" role_id="-1" >
@@ -43059,7 +43059,7 @@ in the constructor, you have to call loadAsync.
                 </codeoperation>
                 <codeoperation parent_id="1647" tag="operation_1647" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqmask " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param mask " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1649" tag="operation_1649" canDelete="false" indentLevel="1" role_id="-1" >
@@ -43204,7 +43204,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock parent_id="1625" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisMaskSP m_tqmask;" >
+              <ccfdeclarationcodeblock parent_id="1625" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisMaskSP m_mask;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -43430,7 +43430,7 @@ in the constructor, you have to call loadAsync.
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock parent_id="1625" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisMaskSP m_tqmask;" >
+       <ccfdeclarationcodeblock parent_id="1625" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisMaskSP m_mask;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
@@ -44510,7 +44510,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1722" parent_class="1722" fileExt=".h" fileName="kistqmask" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1722" parent_class="1722" fileExt=".h" fileName="kismask" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISMASK_H&amp;#010;#define KISMASK_H" >
        <header>
@@ -44611,7 +44611,7 @@ in the constructor, you have to call loadAsync.
                 </codeoperation>
                 <codeoperation parent_id="1732" tag="operation_1732" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqmask " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param mask " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1734" tag="operation_1734" canDelete="false" indentLevel="1" role_id="-1" >
@@ -44758,7 +44758,7 @@ in the constructor, you have to call loadAsync.
       </codeblockwithcomments>
      </textblocks>
      <header>
-      <codecomment tag="" text="/************************************************************************&amp;#010;  			kistqmask.h - Copyright boud&amp;#010;&amp;#010;Here you can write a license for your code, some comments or any other&amp;#010;information you want to have in your generated code. To to this simply&amp;#010;configure the &quot;headings&quot; directory in uml to point to a directory&amp;#010;where you have your heading files.&amp;#010;&amp;#010;or you can just replace the contents of this file with your own.&amp;#010;If you want to do this, this file is located at&amp;#010;&amp;#010;/opt/kde3/share/apps/umbrello/headings/heading.h&amp;#010;&amp;#010;-->Code Generators searches for heading files based on the file extension&amp;#010;   i.e. it will look for a file name ending in &quot;.h&quot; to include in C++ header&amp;#010;   files, and for a file name ending in &quot;.java&quot; to include in all generated&amp;#010;   java code.&amp;#010;   If you name the file &quot;heading.&lt;extension>&quot;, Code Generator will always&amp;#010;   choose this file even if there are other files with the same extension in the&amp;#010;   directory. If you name the file something else, it must be the only one with that&amp;#010;   extension in the directory to guarantee that Code Generator will choose it.&amp;#010;&amp;#010;you can use variables in your heading files which are replaced at generation&amp;#010;time. possible variables are : author, date, time, filename and filepath.&amp;#010;just write %variable_name%&amp;#010;&amp;#010;This file was generated on Sun Feb 8 2004 at 16:45:18&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
+      <codecomment tag="" text="/************************************************************************&amp;#010;  			kismask.h - Copyright boud&amp;#010;&amp;#010;Here you can write a license for your code, some comments or any other&amp;#010;information you want to have in your generated code. To to this simply&amp;#010;configure the &quot;headings&quot; directory in uml to point to a directory&amp;#010;where you have your heading files.&amp;#010;&amp;#010;or you can just replace the contents of this file with your own.&amp;#010;If you want to do this, this file is located at&amp;#010;&amp;#010;/opt/kde3/share/apps/umbrello/headings/heading.h&amp;#010;&amp;#010;-->Code Generators searches for heading files based on the file extension&amp;#010;   i.e. it will look for a file name ending in &quot;.h&quot; to include in C++ header&amp;#010;   files, and for a file name ending in &quot;.java&quot; to include in all generated&amp;#010;   java code.&amp;#010;   If you name the file &quot;heading.&lt;extension>&quot;, Code Generator will always&amp;#010;   choose this file even if there are other files with the same extension in the&amp;#010;   directory. If you name the file something else, it must be the only one with that&amp;#010;   extension in the directory to guarantee that Code Generator will choose it.&amp;#010;&amp;#010;you can use variables in your heading files which are replaced at generation&amp;#010;time. possible variables are : author, date, time, filename and filepath.&amp;#010;just write %variable_name%&amp;#010;&amp;#010;This file was generated on Sun Feb 8 2004 at 16:45:18&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields/>
     </classifiercodedocument>
@@ -44905,7 +44905,7 @@ in the constructor, you have to call loadAsync.
                 </codeoperation>
                 <codeoperation parent_id="1756" tag="operation_1756" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="@return the next tqmask in the pipe.&amp;#010;@param scale " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="@return the next mask in the pipe.&amp;#010;@param scale " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1758" tag="operation_1758" canDelete="false" indentLevel="1" role_id="-1" >
@@ -45685,7 +45685,7 @@ in the constructor, you have to call loadAsync.
                 </codeoperation>
                 <codeoperation parent_id="1814" tag="operation_1814" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqmask " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param mask " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1885" tag="operation_1885" canDelete="false" indentLevel="1" role_id="-1" >
@@ -46419,7 +46419,7 @@ in the constructor, you have to call loadAsync.
                <textblocks>
                 <codeoperation parent_id="1911" tag="operation_1911" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent &amp;#010;@param img &amp;#010;@param name &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parent &amp;#010;@param img &amp;#010;@param name &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1916" tag="operation_1916" canDelete="false" indentLevel="1" role_id="-1" >
@@ -46469,7 +46469,7 @@ in the constructor, you have to call loadAsync.
                 </codeoperation>
                 <codeoperation parent_id="1938" tag="operation_1938" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parent " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1940" tag="operation_1940" canDelete="false" indentLevel="1" role_id="-1" >
@@ -47006,7 +47006,7 @@ in the constructor, you have to call loadAsync.
                <textblocks>
                 <codeoperation parent_id="1947" tag="operation_1947" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param mediateOn &amp;#010;@param rserver &amp;#010;@param chooserCaption &amp;#010;@param chooserParent &amp;#010;@param chooserName &amp;#010;@param tqparent &amp;#010;@param name " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param mediateOn &amp;#010;@param rserver &amp;#010;@param chooserCaption &amp;#010;@param chooserParent &amp;#010;@param chooserName &amp;#010;@param parent &amp;#010;@param name " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1955" tag="operation_1955" canDelete="false" indentLevel="1" role_id="-1" >
@@ -50831,7 +50831,7 @@ in the constructor, you have to call loadAsync.
                 </codeoperation>
                 <codeoperation parent_id="2160" tag="operation_2160" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parent " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="2162" tag="operation_2162" canDelete="false" indentLevel="1" role_id="-1" >
@@ -53071,7 +53071,7 @@ in the constructor, you have to call loadAsync.
                <textblocks>
                 <codeoperation parent_id="2448" tag="operation_2448" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param doc &amp;#010;@param adapter &amp;#010;@param tqparent &amp;#010;@param name " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param doc &amp;#010;@param adapter &amp;#010;@param parent &amp;#010;@param name " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="2458" tag="operation_2458" canDelete="false" indentLevel="1" role_id="-1" >
diff --git a/chalk/doc/channels_masks_selections b/chalk/doc/channels_masks_selections
index 665883637..837e154e0 100644
--- a/chalk/doc/channels_masks_selections
+++ b/chalk/doc/channels_masks_selections
@@ -1,6 +1,6 @@
 We did a rethink on channels, selections and masks last summer.
 
-Traditionally, a tqmask is seen as an extra channel for an image, analogous
+Traditionally, a mask is seen as an extra channel for an image, analogous
 to the alpha channel. We want to do away with that idea.
 
 A layer can have a number of permanent selections associated with it.
diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi
index c517ab0cb..78870c72c 100644
--- a/chalk/doc/colorspaces.xmi
+++ b/chalk/doc/colorspaces.xmi
@@ -344,7 +344,7 @@ XXX: Also add a function that modifies the current alpha with the given alpha, i
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="140" isRoot="false" value="" type="44" isAbstract="false" name="nPixels" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
-      <UML:Operation comment="Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just
+      <UML:Operation comment="Applies the specified 8-bit alpha mask to the pixels. We assume that there are just
 as many alpha values as pixels but we do not check this." isSpecification="false" isLeaf="false" visibility="public" xmi.id="141" isRoot="false" isAbstract="false" name="applyAphaU8Mask" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="142" isRoot="false" value="" type="78" isAbstract="false" name="pixels" />
@@ -352,7 +352,7 @@ as many alpha values as pixels but we do not check this." isSpecification="false
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="144" isRoot="false" value="" type="44" isAbstract="false" name="nPixels" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
-      <UML:Operation comment="Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just
+      <UML:Operation comment="Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just
 as many alpha values as pixels but we do not check this." isSpecification="false" isLeaf="false" visibility="public" xmi.id="145" isRoot="false" isAbstract="false" name="applyInverseAlphaU8Mask" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="146" isRoot="false" value="" type="78" isAbstract="false" name="pixels" />
@@ -560,8 +560,8 @@ This class is the base for all 8-bit/channel colorspaces" isSpecification="false
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //**
-The alpha tqmask is a special color strategy that treats all pixels as
-alpha value with a colour common to the tqmask. The default color is white." isSpecification="false" isLeaf="false" visibility="public" xmi.id="255" isRoot="false" isAbstract="false" name="KisAlphaColorSpace" >
+The alpha mask is a special color strategy that treats all pixels as
+alpha value with a colour common to the mask. The default color is white." isSpecification="false" isLeaf="false" visibility="public" xmi.id="255" isRoot="false" isAbstract="false" name="KisAlphaColorSpace" >
      <UML:GeneralizableElement.generalization>
       <UML:Generalization xmi.idref="256" />
      </UML:GeneralizableElement.generalization>
@@ -991,7 +991,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="458" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="459" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="460" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="461" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="461" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="462" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="463" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="464" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1004,7 +1004,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="468" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="469" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="470" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="471" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="471" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="472" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="473" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="474" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1017,7 +1017,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="478" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="479" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="480" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="481" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="481" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="482" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="483" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="484" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1030,7 +1030,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="488" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="489" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="490" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="491" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="491" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="492" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="493" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="494" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1043,7 +1043,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="498" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="499" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="500" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="501" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="501" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="502" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="503" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="504" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1056,7 +1056,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="508" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="509" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="510" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="511" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="511" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="512" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="513" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="514" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1069,7 +1069,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="518" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="519" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="520" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="521" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="521" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="522" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="523" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="524" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1082,7 +1082,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="528" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="529" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="530" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="531" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="531" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="532" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="533" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="534" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1095,7 +1095,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="538" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="539" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="540" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="541" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="541" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="542" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="543" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="544" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1108,7 +1108,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="548" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="549" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="550" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="551" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="551" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="552" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="553" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="554" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1121,7 +1121,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="558" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="559" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="560" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="561" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="561" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="562" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="563" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="564" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1527,7 +1527,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="761" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="762" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="763" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="764" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="764" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="765" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="766" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="767" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1540,7 +1540,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="771" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="772" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="773" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="774" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="774" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="775" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="776" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="777" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1553,7 +1553,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="781" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="782" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="783" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="784" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="784" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="785" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="786" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="787" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1566,7 +1566,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="791" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="792" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="793" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="794" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="794" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="795" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="796" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="797" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1579,7 +1579,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="801" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="802" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="803" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="804" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="804" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="805" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="806" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="807" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1592,7 +1592,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="811" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="812" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="813" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="814" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="814" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="815" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="816" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="817" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1605,7 +1605,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="821" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="822" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="823" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="824" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="824" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="825" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="826" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="827" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1618,7 +1618,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="831" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="832" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="833" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="834" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="834" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="835" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="836" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="837" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1631,7 +1631,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="841" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="842" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="843" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="844" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="844" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="845" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="846" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="847" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1644,7 +1644,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="851" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="852" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="853" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="854" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="854" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="855" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="856" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="857" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1678,7 +1678,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="878" isRoot="false" initialValue="" type="126" isAbstract="false" name="m_ColorSpaceRGBF32" />
       <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="869" isRoot="false" isAbstract="false" name="RGBF32Plugin" >
        <UML:BehavioralFeature.parameter>
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="872" isRoot="false" value="" type="871" isAbstract="false" name="tqparent" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="872" isRoot="false" value="" type="871" isAbstract="false" name="parent" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="874" isRoot="false" value="" type="873" isAbstract="false" name="name" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="876" isRoot="false" value="" type="875" isAbstract="false" name="" />
        </UML:BehavioralFeature.parameter>
@@ -1894,7 +1894,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="976" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="977" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="978" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="979" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="979" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="980" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="981" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="982" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1907,7 +1907,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="986" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="987" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="988" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="989" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="989" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="990" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="991" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="992" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1920,7 +1920,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="996" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="997" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="998" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="999" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="999" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1000" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1001" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1002" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1933,7 +1933,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1006" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1007" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1008" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1009" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1009" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1010" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1011" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1012" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1946,7 +1946,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1016" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1017" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1018" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1019" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1019" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1020" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1021" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1022" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1959,7 +1959,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1026" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1027" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1028" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1029" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1029" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1030" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1031" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1032" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1972,7 +1972,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1036" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1037" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1038" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1039" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1039" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1040" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1041" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1042" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1985,7 +1985,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1046" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1047" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1048" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1049" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1049" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1050" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1051" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1052" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -1998,7 +1998,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1056" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1057" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1058" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1059" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1059" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1060" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1061" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1062" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2011,7 +2011,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1066" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1067" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1068" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1069" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1069" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1070" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1071" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1072" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2024,7 +2024,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1076" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1077" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1078" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1079" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1079" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1080" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1081" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1082" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2037,7 +2037,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1086" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1087" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1088" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1089" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1089" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1090" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1091" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1092" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2050,7 +2050,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1096" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1097" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1098" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1099" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1099" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1100" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1101" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1102" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2063,7 +2063,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1106" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1107" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1108" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1109" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1109" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1110" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1111" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1112" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2076,7 +2076,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1116" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1117" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1118" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1119" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1119" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1120" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1121" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1122" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2291,7 +2291,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1232" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1233" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1234" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1235" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1235" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1236" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1237" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1238" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2304,7 +2304,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1242" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1243" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1244" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1245" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1245" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1246" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1247" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1248" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2317,7 +2317,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1252" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1253" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1254" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1255" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1255" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1256" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1257" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1258" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2330,7 +2330,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1262" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1263" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1264" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1265" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1265" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1266" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1267" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1268" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2343,7 +2343,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1272" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1273" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1274" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1275" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1275" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1276" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1277" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1278" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2356,7 +2356,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1282" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1283" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1284" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1285" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1285" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1286" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1287" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1288" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2369,7 +2369,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1292" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1293" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1294" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1295" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1295" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1296" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1297" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1298" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2382,7 +2382,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1302" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1303" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1304" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1305" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1305" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1306" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1307" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1308" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2395,7 +2395,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1312" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1313" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1314" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1315" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1315" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1316" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1317" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1318" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2408,7 +2408,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1322" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1323" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1324" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1325" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1325" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1326" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1327" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1328" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2421,7 +2421,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1332" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1333" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1334" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1335" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1335" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1336" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1337" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1338" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2434,7 +2434,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1342" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1343" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1344" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1345" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1345" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1346" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1347" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1348" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2447,7 +2447,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1352" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1353" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1354" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1355" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1355" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1356" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1357" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1358" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2460,7 +2460,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1362" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1363" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1364" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1365" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1365" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1366" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1367" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1368" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2473,7 +2473,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1372" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1373" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1374" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1375" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1375" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1376" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1377" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1378" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2701,7 +2701,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1500" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1501" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1502" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1503" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1503" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1504" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1505" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1506" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2714,7 +2714,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1510" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1511" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1512" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1513" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1513" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1514" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1515" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1516" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2727,7 +2727,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1520" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1521" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1522" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1523" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1523" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1524" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1525" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1526" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2740,7 +2740,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1530" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1531" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1532" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1533" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1533" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1534" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1535" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1536" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2753,7 +2753,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1540" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1541" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1542" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1543" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1543" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1544" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1545" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1546" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2766,7 +2766,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1550" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1551" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1552" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1553" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1553" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1554" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1555" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1556" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2779,7 +2779,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1560" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1561" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1562" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1563" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1563" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1564" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1565" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1566" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2792,7 +2792,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1570" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1571" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1572" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1573" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1573" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1574" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1575" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1576" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2805,7 +2805,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1580" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1581" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1582" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1583" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1583" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1584" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1585" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1586" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2818,7 +2818,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1590" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1591" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1592" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1593" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1593" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1594" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1595" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1596" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2831,7 +2831,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1600" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1601" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1602" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1603" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1603" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1604" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1605" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1606" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2844,7 +2844,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1610" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1611" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1612" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1613" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1613" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1614" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1615" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1616" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2857,7 +2857,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1620" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1621" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1622" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1623" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1623" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1624" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1625" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1626" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -2870,7 +2870,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1630" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1631" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1632" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1633" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1633" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1634" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1635" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1636" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -3322,7 +3322,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1867" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1868" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1869" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1870" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1870" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1871" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1872" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1873" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -3335,7 +3335,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1877" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1878" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1879" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1880" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1880" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1881" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1882" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1883" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -3348,7 +3348,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1887" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1888" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1889" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1890" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1890" isRoot="false" value="" type="54" isAbstract="false" name="mask" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1891" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1892" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1893" isRoot="false" value="" type="44" isAbstract="false" name="columns" />
@@ -3358,20 +3358,20 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </UML:Classifier.feature>
     </UML:Class>
     <UML:Interface stereotype="12051" isSpecification="false" isLeaf="false" visibility="public" xmi.id="12050" isRoot="false" isAbstract="true" name="KisColorSpaceDescriptor" />
-    <UML:Generalization isSpecification="false" child="26" visibility="public" xmi.id="28" tqparent="27" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="247" visibility="public" xmi.id="248" tqparent="26" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="255" visibility="public" xmi.id="256" tqparent="247" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="350" visibility="public" xmi.id="351" tqparent="26" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="358" visibility="public" xmi.id="359" tqparent="26" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="369" visibility="public" xmi.id="370" tqparent="358" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="575" visibility="public" xmi.id="576" tqparent="247" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="669" visibility="public" xmi.id="670" tqparent="247" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="863" visibility="public" xmi.id="866" tqparent="865" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="879" visibility="public" xmi.id="880" tqparent="350" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1134" visibility="public" xmi.id="1135" tqparent="358" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1386" visibility="public" xmi.id="1387" tqparent="247" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1663" visibility="public" xmi.id="1664" tqparent="26" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1774" visibility="public" xmi.id="1775" tqparent="26" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="26" visibility="public" xmi.id="28" parent="27" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="247" visibility="public" xmi.id="248" parent="26" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="255" visibility="public" xmi.id="256" parent="247" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="350" visibility="public" xmi.id="351" parent="26" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="358" visibility="public" xmi.id="359" parent="26" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="369" visibility="public" xmi.id="370" parent="358" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="575" visibility="public" xmi.id="576" parent="247" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="669" visibility="public" xmi.id="670" parent="247" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="863" visibility="public" xmi.id="866" parent="865" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="879" visibility="public" xmi.id="880" parent="350" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1134" visibility="public" xmi.id="1135" parent="358" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1386" visibility="public" xmi.id="1387" parent="247" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1663" visibility="public" xmi.id="1664" parent="26" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1774" visibility="public" xmi.id="1775" parent="26" discriminator="" name="" />
    </UML:Namespace.ownedElement>
   </UML:Model>
  </XMI.content>
@@ -5951,12 +5951,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             </codeoperation>
             <codeoperation parent_id="141" tag="operation_141" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
+              <javacodedocumentation tag="" indentLevel="1" text="Applies the specified 8-bit alpha mask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
              </header>
             </codeoperation>
             <codeoperation parent_id="145" tag="operation_145" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
+              <javacodedocumentation tag="" indentLevel="1" text="Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
              </header>
             </codeoperation>
             <codeoperation parent_id="149" tag="operation_149" canDelete="false" indentLevel="1" >
@@ -9851,7 +9851,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeblockwithcomments>
       <javaclassdeclarationblock parent_id="255" tag="ClassDeclBlock" canDelete="false" >
        <header>
-        <javacodedocumentation tag="" text="Class KisAlphaColorSpace&amp;#010; Copyright (c) 2004 Boudewijn Rempt &lt;boud@valdyas.org>&amp;#010;&amp;#010; This program is free software; you can redistribute it and/or modify&amp;#010; it under the terms of the GNU General Public License as published by&amp;#010; the Free Software Foundation; either version 2 of the License, or&amp;#010; (at your option) any later version.&amp;#010;&amp;#010; This program is distributed in the hope that it will be useful,&amp;#010; but WITHOUT ANY WARRANTY; without even the implied warranty of&amp;#010; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&amp;#010; GNU General Public License for more details.&amp;#010;&amp;#010; You should have received a copy of the GNU General Public License&amp;#010; along with this program; if not, write to the Free Software&amp;#010; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.&amp;#010;//**&amp;#010;The alpha tqmask is a special color strategy that treats all pixels as&amp;#010;alpha value with a colour common to the tqmask. The default color is white." />
+        <javacodedocumentation tag="" text="Class KisAlphaColorSpace&amp;#010; Copyright (c) 2004 Boudewijn Rempt &lt;boud@valdyas.org>&amp;#010;&amp;#010; This program is free software; you can redistribute it and/or modify&amp;#010; it under the terms of the GNU General Public License as published by&amp;#010; the Free Software Foundation; either version 2 of the License, or&amp;#010; (at your option) any later version.&amp;#010;&amp;#010; This program is distributed in the hope that it will be useful,&amp;#010; but WITHOUT ANY WARRANTY; without even the implied warranty of&amp;#010; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&amp;#010; GNU General Public License for more details.&amp;#010;&amp;#010; You should have received a copy of the GNU General Public License&amp;#010; along with this program; if not, write to the Free Software&amp;#010; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.&amp;#010;//**&amp;#010;The alpha mask is a special color strategy that treats all pixels as&amp;#010;alpha value with a colour common to the mask. The default color is white." />
        </header>
        <textblocks>
         <hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" >
@@ -10987,57 +10987,57 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             </codeoperation>
             <codeoperation parent_id="456" tag="operation_456" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="466" tag="operation_466" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="476" tag="operation_476" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="486" tag="operation_486" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="496" tag="operation_496" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="506" tag="operation_506" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="516" tag="operation_516" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="526" tag="operation_526" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="536" tag="operation_536" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="546" tag="operation_546" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="556" tag="operation_556" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -12433,52 +12433,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             </codeoperation>
             <codeoperation parent_id="759" tag="operation_759" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="769" tag="operation_769" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="779" tag="operation_779" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="789" tag="operation_789" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="799" tag="operation_799" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="809" tag="operation_809" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="819" tag="operation_819" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="829" tag="operation_829" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="839" tag="operation_839" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="849" tag="operation_849" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -12747,7 +12747,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
            <textblocks>
             <codeoperation parent_id="869" tag="operation_869" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent &amp;#010;@param name &amp;#010;@param  &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parent &amp;#010;@param name &amp;#010;@param  &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="877" tag="operation_877" canDelete="false" indentLevel="1" >
@@ -13577,77 +13577,77 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             </codeoperation>
             <codeoperation parent_id="974" tag="operation_974" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="984" tag="operation_984" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="994" tag="operation_994" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1004" tag="operation_1004" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1014" tag="operation_1014" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1024" tag="operation_1024" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1034" tag="operation_1034" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1044" tag="operation_1044" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1054" tag="operation_1054" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1064" tag="operation_1064" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1074" tag="operation_1074" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1084" tag="operation_1084" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1094" tag="operation_1094" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1104" tag="operation_1104" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1114" tag="operation_1114" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -14321,77 +14321,77 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             </codeoperation>
             <codeoperation parent_id="1230" tag="operation_1230" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1240" tag="operation_1240" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1250" tag="operation_1250" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1260" tag="operation_1260" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1270" tag="operation_1270" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1280" tag="operation_1280" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1290" tag="operation_1290" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1300" tag="operation_1300" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1310" tag="operation_1310" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1320" tag="operation_1320" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1330" tag="operation_1330" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1340" tag="operation_1340" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1350" tag="operation_1350" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1360" tag="operation_1360" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1370" tag="operation_1370" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -14885,72 +14885,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             </codeoperation>
             <codeoperation parent_id="1498" tag="operation_1498" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1508" tag="operation_1508" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1518" tag="operation_1518" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1528" tag="operation_1528" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1538" tag="operation_1538" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1548" tag="operation_1548" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1558" tag="operation_1558" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1568" tag="operation_1568" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1578" tag="operation_1578" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1588" tag="operation_1588" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1598" tag="operation_1598" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1608" tag="operation_1608" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1618" tag="operation_1618" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1628" tag="operation_1628" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -17422,17 +17422,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             </codeoperation>
             <codeoperation parent_id="1865" tag="operation_1865" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1875" tag="operation_1875" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1885" tag="operation_1885" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -18277,12 +18277,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         </codeoperation>
         <codeoperation parent_id="141" tag="operation_141" canDelete="false" writeOutText="false" >
          <header>
-          <cppcodedocumentation tag="" text="Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
+          <cppcodedocumentation tag="" text="Applies the specified 8-bit alpha mask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
          </header>
         </codeoperation>
         <codeoperation parent_id="145" tag="operation_145" canDelete="false" writeOutText="false" >
          <header>
-          <cppcodedocumentation tag="" text="Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
+          <cppcodedocumentation tag="" text="Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
          </header>
         </codeoperation>
         <codeoperation parent_id="149" tag="operation_149" canDelete="false" writeOutText="false" >
@@ -25935,12 +25935,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 </codeoperation>
                 <codeoperation parent_id="141" tag="operation_141" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
+                  <cppcodedocumentation tag="" indentLevel="1" text="Applies the specified 8-bit alpha mask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="145" tag="operation_145" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
+                  <cppcodedocumentation tag="" indentLevel="1" text="Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just&amp;#010;as many alpha values as pixels but we do not check this." />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="149" tag="operation_149" canDelete="false" indentLevel="1" >
@@ -31577,7 +31577,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         </codeblockwithcomments>
         <cppheaderclassdeclarationblock parent_id="255" tag="classDeclarationBlock" canDelete="false" >
          <header>
-          <cppcodedocumentation tag="" text="Class KisAlphaColorSpace&amp;#010; Copyright (c) 2004 Boudewijn Rempt &lt;boud@valdyas.org>&amp;#010;&amp;#010; This program is free software; you can redistribute it and/or modify&amp;#010; it under the terms of the GNU General Public License as published by&amp;#010; the Free Software Foundation; either version 2 of the License, or&amp;#010; (at your option) any later version.&amp;#010;&amp;#010; This program is distributed in the hope that it will be useful,&amp;#010; but WITHOUT ANY WARRANTY; without even the implied warranty of&amp;#010; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&amp;#010; GNU General Public License for more details.&amp;#010;&amp;#010; You should have received a copy of the GNU General Public License&amp;#010; along with this program; if not, write to the Free Software&amp;#010; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.&amp;#010;//**&amp;#010;The alpha tqmask is a special color strategy that treats all pixels as&amp;#010;alpha value with a colour common to the tqmask. The default color is white." />
+          <cppcodedocumentation tag="" text="Class KisAlphaColorSpace&amp;#010; Copyright (c) 2004 Boudewijn Rempt &lt;boud@valdyas.org>&amp;#010;&amp;#010; This program is free software; you can redistribute it and/or modify&amp;#010; it under the terms of the GNU General Public License as published by&amp;#010; the Free Software Foundation; either version 2 of the License, or&amp;#010; (at your option) any later version.&amp;#010;&amp;#010; This program is distributed in the hope that it will be useful,&amp;#010; but WITHOUT ANY WARRANTY; without even the implied warranty of&amp;#010; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&amp;#010; GNU General Public License for more details.&amp;#010;&amp;#010; You should have received a copy of the GNU General Public License&amp;#010; along with this program; if not, write to the Free Software&amp;#010; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.&amp;#010;//**&amp;#010;The alpha mask is a special color strategy that treats all pixels as&amp;#010;alpha value with a colour common to the mask. The default color is white." />
          </header>
          <textblocks>
           <hierarchicalcodeblock tag="publicBlock" canDelete="false" >
@@ -32664,57 +32664,57 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                <textblocks>
                 <codeoperation parent_id="456" tag="operation_456" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="466" tag="operation_466" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="476" tag="operation_476" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="486" tag="operation_486" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="496" tag="operation_496" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="506" tag="operation_506" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="516" tag="operation_516" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="526" tag="operation_526" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="536" tag="operation_536" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="546" tag="operation_546" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="556" tag="operation_556" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -34437,52 +34437,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                <textblocks>
                 <codeoperation parent_id="759" tag="operation_759" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="769" tag="operation_769" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="779" tag="operation_779" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="789" tag="operation_789" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="799" tag="operation_799" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="809" tag="operation_809" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="819" tag="operation_819" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="829" tag="operation_829" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="839" tag="operation_839" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="849" tag="operation_849" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -34958,7 +34958,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                <textblocks>
                 <codeoperation parent_id="869" tag="operation_869" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent &amp;#010;@param name &amp;#010;@param  " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parent &amp;#010;@param name &amp;#010;@param  " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="877" tag="operation_877" canDelete="false" indentLevel="1" >
@@ -36008,77 +36008,77 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 </codeoperation>
                 <codeoperation parent_id="974" tag="operation_974" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="984" tag="operation_984" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="994" tag="operation_994" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1004" tag="operation_1004" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1014" tag="operation_1014" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1024" tag="operation_1024" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1034" tag="operation_1034" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1044" tag="operation_1044" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1054" tag="operation_1054" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1064" tag="operation_1064" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1074" tag="operation_1074" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1084" tag="operation_1084" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1094" tag="operation_1094" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1104" tag="operation_1104" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1114" tag="operation_1114" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -37039,77 +37039,77 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 </codeoperation>
                 <codeoperation parent_id="1230" tag="operation_1230" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1240" tag="operation_1240" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1250" tag="operation_1250" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1260" tag="operation_1260" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1270" tag="operation_1270" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1280" tag="operation_1280" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1290" tag="operation_1290" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1300" tag="operation_1300" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1310" tag="operation_1310" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1320" tag="operation_1320" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1330" tag="operation_1330" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1340" tag="operation_1340" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1350" tag="operation_1350" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1360" tag="operation_1360" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1370" tag="operation_1370" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -37892,72 +37892,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 </codeoperation>
                 <codeoperation parent_id="1498" tag="operation_1498" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1508" tag="operation_1508" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1518" tag="operation_1518" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1528" tag="operation_1528" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1538" tag="operation_1538" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1548" tag="operation_1548" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1558" tag="operation_1558" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1568" tag="operation_1568" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1578" tag="operation_1578" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1588" tag="operation_1588" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1598" tag="operation_1598" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1608" tag="operation_1608" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1618" tag="operation_1618" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1628" tag="operation_1628" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -41703,17 +41703,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                <textblocks>
                 <codeoperation parent_id="1865" tag="operation_1865" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1875" tag="operation_1875" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                 <codeoperation parent_id="1885" tag="operation_1885" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param mask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
diff --git a/chalk/doc/colorstrategyAPI b/chalk/doc/colorstrategyAPI
index faa5724e7..bb6e12675 100644
--- a/chalk/doc/colorstrategyAPI
+++ b/chalk/doc/colorstrategyAPI
@@ -3,7 +3,7 @@ This is a working document. It list the places where pixels are mangled and requ
 The purpose is to find out which functions an API in colorstrategy must have to support pixelmangling in a colorstretegy independent manner.
 
 
-Requested function: apply an alpha tqmask to pixels
+Requested function: apply an alpha mask to pixels
 Problem: alpha is hard-coded 8-bit in KisPixel, when it should be free
 
 void KisPaintDevice::clearSelection()
@@ -33,20 +33,20 @@ void KisPaintDevice::clearSelection()
 	}
 }
 
-void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask)
+void KisPaintDevice::applySelectionMask(KisSelectionSP mask)
 {
-	QRect r = tqmask -> extent();
+	QRect r = mask -> extent();
 	crop(r);
 
 	for (Q_INT32 y = r.top(); y <= r.bottom(); ++y) {
 
 		KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true);
-		KisHLineIterator maskIt = tqmask -> createHLineIterator(r.x(), y, r.width(), false);
+		KisHLineIterator maskIt = mask -> createHLineIterator(r.x(), y, r.width(), false);
 
 		while (!pixelIt.isDone()) {
 
 			KisPixel pixel = toPixel(pixelIt.rawData());
-			KisPixel maskValue = tqmask -> toPixel(maskIt.rawData());
+			KisPixel maskValue = mask -> toPixel(maskIt.rawData());
 
 			pixel.alpha() = (pixel.alpha() * maskValue.alpha()) / MAX_SELECTED;
 
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi
index 2f64556e9..7d2427134 100644
--- a/chalk/doc/controller.xmi
+++ b/chalk/doc/controller.xmi
@@ -284,7 +284,7 @@ All this functionality is centered around a view with a certain document and an
 
 XXX: Should this be the basis for simple scriptability? Have every controller register every action using a KisID and a parameter description list, and offer a queryActions() and an executeAction(KisID) method?" isSpecification="false" isLeaf="false" visibility="public" xmi.id="13" isRoot="false" isAbstract="true" name="KisMetaControllerInterface" >
      <UML:Classifier.feature>
-      <UML:Operation comment="Retrieve the view widget that is controlled by this controller; it can be used to tqparent dialogs." isSpecification="false" isLeaf="false" visibility="public" xmi.id="20" isRoot="false" isAbstract="false" name="getView" >
+      <UML:Operation comment="Retrieve the view widget that is controlled by this controller; it can be used to parent dialogs." isSpecification="false" isLeaf="false" visibility="public" xmi.id="20" isRoot="false" isAbstract="false" name="getView" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter kind="return" xmi.id="5323" type="22" />
        </UML:BehavioralFeature.parameter>
@@ -1376,7 +1376,7 @@ the value of a byte signifies whether a corresponding pixel is selected, or not.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1666" isRoot="false" value="" type="475" isAbstract="false" name="r" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
-      <UML:Operation comment="// Keep the selection but set the tqmask to color c// Note: it is intentional to deep-copy the color// since the selection will want to own its own copy." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1667" isRoot="false" isAbstract="false" name="setMaskColor" >
+      <UML:Operation comment="// Keep the selection but set the mask to color c// Note: it is intentional to deep-copy the color// since the selection will want to own its own copy." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1667" isRoot="false" isAbstract="false" name="setMaskColor" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1669" isRoot="false" value="" type="1668" isAbstract="false" name="c" />
        </UML:BehavioralFeature.parameter>
@@ -2097,7 +2097,7 @@ and the clipboard." isSpecification="false" isLeaf="false" visibility="public" x
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1859" isRoot="false" initialValue="" type="1858" isAbstract="false" name="m_pluginActions" />
       <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1801" isRoot="false" isAbstract="false" name="KisSelectionManager" >
        <UML:BehavioralFeature.parameter>
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1802" isRoot="false" value="" type="1699" isAbstract="false" name="tqparent" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1802" isRoot="false" value="" type="1699" isAbstract="false" name="parent" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1804" isRoot="false" value="" type="1803" isAbstract="false" name="doc" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
@@ -3329,39 +3329,39 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1796" isRoot="false" isAbstract="false" name="KisDoc" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1797" isRoot="false" isAbstract="false" name="KisClipboard" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1858" isRoot="false" isAbstract="false" name="QPtrList" />
-    <UML:Generalization isSpecification="false" child="363" visibility="public" xmi.id="366" tqparent="365" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="541" visibility="public" xmi.id="543" tqparent="542" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="445" visibility="public" xmi.id="656" tqparent="542" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="429" visibility="public" xmi.id="673" tqparent="542" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="781" visibility="public" xmi.id="782" tqparent="776" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="788" visibility="public" xmi.id="789" tqparent="776" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="795" visibility="public" xmi.id="796" tqparent="776" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="802" visibility="public" xmi.id="803" tqparent="776" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="809" visibility="public" xmi.id="810" tqparent="776" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="816" visibility="public" xmi.id="817" tqparent="776" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="825" visibility="public" xmi.id="826" tqparent="776" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="832" visibility="public" xmi.id="834" tqparent="833" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="868" visibility="public" xmi.id="870" tqparent="869" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="437" visibility="public" xmi.id="917" tqparent="868" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="437" visibility="public" xmi.id="920" tqparent="542" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="383" visibility="public" xmi.id="961" tqparent="869" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="383" visibility="public" xmi.id="964" tqparent="542" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1168" visibility="public" xmi.id="1169" tqparent="1160" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1177" visibility="public" xmi.id="1178" tqparent="1160" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1260" visibility="public" xmi.id="1261" tqparent="1253" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1268" visibility="public" xmi.id="1269" tqparent="1253" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1276" visibility="public" xmi.id="1277" tqparent="1253" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1284" visibility="public" xmi.id="1285" tqparent="1253" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1292" visibility="public" xmi.id="1293" tqparent="1253" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1300" visibility="public" xmi.id="1301" tqparent="1253" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1310" visibility="public" xmi.id="1311" tqparent="1253" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1318" visibility="public" xmi.id="1319" tqparent="833" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="423" visibility="public" xmi.id="1349" tqparent="1348" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="388" visibility="public" xmi.id="1433" tqparent="869" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="388" visibility="public" xmi.id="1436" tqparent="542" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="398" visibility="public" xmi.id="1649" tqparent="388" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="1694" visibility="public" xmi.id="1695" tqparent="869" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="577" visibility="public" xmi.id="1798" tqparent="869" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="363" visibility="public" xmi.id="366" parent="365" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="541" visibility="public" xmi.id="543" parent="542" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="445" visibility="public" xmi.id="656" parent="542" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="429" visibility="public" xmi.id="673" parent="542" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="781" visibility="public" xmi.id="782" parent="776" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="788" visibility="public" xmi.id="789" parent="776" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="795" visibility="public" xmi.id="796" parent="776" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="802" visibility="public" xmi.id="803" parent="776" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="809" visibility="public" xmi.id="810" parent="776" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="816" visibility="public" xmi.id="817" parent="776" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="825" visibility="public" xmi.id="826" parent="776" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="832" visibility="public" xmi.id="834" parent="833" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="868" visibility="public" xmi.id="870" parent="869" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="437" visibility="public" xmi.id="917" parent="868" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="437" visibility="public" xmi.id="920" parent="542" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="383" visibility="public" xmi.id="961" parent="869" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="383" visibility="public" xmi.id="964" parent="542" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1168" visibility="public" xmi.id="1169" parent="1160" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1177" visibility="public" xmi.id="1178" parent="1160" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1260" visibility="public" xmi.id="1261" parent="1253" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1268" visibility="public" xmi.id="1269" parent="1253" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1276" visibility="public" xmi.id="1277" parent="1253" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1284" visibility="public" xmi.id="1285" parent="1253" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1292" visibility="public" xmi.id="1293" parent="1253" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1300" visibility="public" xmi.id="1301" parent="1253" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1310" visibility="public" xmi.id="1311" parent="1253" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1318" visibility="public" xmi.id="1319" parent="833" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="423" visibility="public" xmi.id="1349" parent="1348" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="388" visibility="public" xmi.id="1433" parent="869" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="388" visibility="public" xmi.id="1436" parent="542" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="398" visibility="public" xmi.id="1649" parent="388" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="1694" visibility="public" xmi.id="1695" parent="869" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="577" visibility="public" xmi.id="1798" parent="869" discriminator="" name="" />
    </UML:Namespace.ownedElement>
   </UML:Model>
  </XMI.content>
@@ -5308,7 +5308,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
            <textblocks>
             <codeoperation parent_id="20" tag="operation_20" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="Retrieve the view widget that is controlled by this controller; it can be used to tqparent dialogs." />
+              <javacodedocumentation tag="" indentLevel="1" text="Retrieve the view widget that is controlled by this controller; it can be used to parent dialogs." />
              </header>
             </codeoperation>
             <codeoperation parent_id="25" tag="operation_25" canDelete="false" indentLevel="1" >
@@ -10587,7 +10587,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             </codeoperation>
             <codeoperation parent_id="1667" tag="operation_1667" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="// Keep the selection but set the tqmask to color c// Note: it is intentional to deep-copy the color// since the selection will want to own its own copy." />
+              <javacodedocumentation tag="" indentLevel="1" text="// Keep the selection but set the mask to color c// Note: it is intentional to deep-copy the color// since the selection will want to own its own copy." />
              </header>
             </codeoperation>
             <codeoperation parent_id="1670" tag="operation_1670" canDelete="false" indentLevel="1" >
@@ -19217,7 +19217,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
            <textblocks>
             <codeoperation parent_id="1801" tag="operation_1801" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent &amp;#010;@param doc &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parent &amp;#010;@param doc &amp;#010;@return void  " />
              </header>
             </codeoperation>
             <codeoperation parent_id="1805" tag="operation_1805" canDelete="false" indentLevel="1" >
diff --git a/chalk/doc/histograms.xmi b/chalk/doc/histograms.xmi
index 5cd0f4840..3c2275d07 100644
--- a/chalk/doc/histograms.xmi
+++ b/chalk/doc/histograms.xmi
@@ -1380,7 +1380,7 @@ like sRGB).
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1257" isRoot="false" value="" type="6" isAbstract="false" name="exposure" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
-      <UML:Operation comment="Create an RGBA QImage from a rectangle in the paint device. The rectangle is defined by the tqparent image's bounds.
+      <UML:Operation comment="Create an RGBA QImage from a rectangle in the paint device. The rectangle is defined by the parent image's bounds.
 
 @param dstProfile RGB profile to use in conversion. May be 0, in which
 case it's up to the colour strategy to choose a profile (most
@@ -1650,10 +1650,10 @@ bytes, bad things will happen. XXX: use vectors?" isSpecification="false" isLeaf
       </UML:Operation>
       <UML:Operation comment="Deselect the selection for this paintdevice." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1364" isRoot="false" isAbstract="false" name="deselect" />
       <UML:Operation comment="Clear the selected pixels from the paint device" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1365" isRoot="false" isAbstract="false" name="clearSelection" />
-      <UML:Operation comment="Apply a tqmask to the image data, i.e. multiply each pixel's opacity by its
-selectedness in the tqmask." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1366" isRoot="false" isAbstract="false" name="applySelectionMask" >
+      <UML:Operation comment="Apply a mask to the image data, i.e. multiply each pixel's opacity by its
+selectedness in the mask." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1366" isRoot="false" isAbstract="false" name="applySelectionMask" >
        <UML:BehavioralFeature.parameter>
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1367" isRoot="false" value="" type="445" isAbstract="false" name="tqmask" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1367" isRoot="false" value="" type="445" isAbstract="false" name="mask" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
       <UML:Operation isSpecification="false" isLeaf="false" visibility="protected" xmi.id="1368" isRoot="false" isAbstract="false" name="visibilityChanged" >
@@ -3171,33 +3171,33 @@ of choice, and rounded to a reasonable precision to avoid 0.999999" isSpecificat
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1147" isRoot="false" isAbstract="false" name="KisPaintDevice" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1267" isRoot="false" isAbstract="false" name="QColor" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1373" isRoot="false" isAbstract="false" name="Q_INT8" />
-    <UML:Generalization isSpecification="false" child="14" visibility="public" xmi.id="16" tqparent="15" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="70" visibility="public" xmi.id="73" tqparent="72" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="89" visibility="public" xmi.id="90" tqparent="14" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="131" visibility="public" xmi.id="132" tqparent="89" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="144" visibility="public" xmi.id="145" tqparent="89" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="157" visibility="public" xmi.id="158" tqparent="89" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="170" visibility="public" xmi.id="172" tqparent="61" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="183" visibility="public" xmi.id="184" tqparent="89" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="196" visibility="public" xmi.id="197" tqparent="61" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="205" visibility="public" xmi.id="206" tqparent="89" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="218" visibility="public" xmi.id="219" tqparent="61" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="340" visibility="public" xmi.id="341" tqparent="263" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="340" visibility="public" xmi.id="344" tqparent="309" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="370" visibility="public" xmi.id="371" tqparent="288" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="370" visibility="public" xmi.id="374" tqparent="309" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="11" visibility="public" xmi.id="398" tqparent="234" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="11" visibility="public" xmi.id="401" tqparent="309" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="451" visibility="public" xmi.id="487" tqparent="15" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="560" visibility="public" xmi.id="562" tqparent="15" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="559" visibility="public" xmi.id="644" tqparent="15" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="233" visibility="public" xmi.id="780" tqparent="559" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="425" visibility="public" xmi.id="887" tqparent="886" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="425" visibility="public" xmi.id="890" tqparent="15" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1144" tqparent="886" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1148" tqparent="1147" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1151" tqparent="15" discriminator="" name="" />
-    <UML:Generalization isSpecification="false" child="434" visibility="public" xmi.id="1400" tqparent="312" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="14" visibility="public" xmi.id="16" parent="15" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="70" visibility="public" xmi.id="73" parent="72" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="89" visibility="public" xmi.id="90" parent="14" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="131" visibility="public" xmi.id="132" parent="89" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="144" visibility="public" xmi.id="145" parent="89" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="157" visibility="public" xmi.id="158" parent="89" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="170" visibility="public" xmi.id="172" parent="61" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="183" visibility="public" xmi.id="184" parent="89" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="196" visibility="public" xmi.id="197" parent="61" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="205" visibility="public" xmi.id="206" parent="89" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="218" visibility="public" xmi.id="219" parent="61" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="340" visibility="public" xmi.id="341" parent="263" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="340" visibility="public" xmi.id="344" parent="309" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="370" visibility="public" xmi.id="371" parent="288" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="370" visibility="public" xmi.id="374" parent="309" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="11" visibility="public" xmi.id="398" parent="234" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="11" visibility="public" xmi.id="401" parent="309" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="451" visibility="public" xmi.id="487" parent="15" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="560" visibility="public" xmi.id="562" parent="15" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="559" visibility="public" xmi.id="644" parent="15" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="233" visibility="public" xmi.id="780" parent="559" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="425" visibility="public" xmi.id="887" parent="886" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="425" visibility="public" xmi.id="890" parent="15" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1144" parent="886" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1148" parent="1147" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1151" parent="15" discriminator="" name="" />
+    <UML:Generalization isSpecification="false" child="434" visibility="public" xmi.id="1400" parent="312" discriminator="" name="" />
    </UML:Namespace.ownedElement>
   </UML:Model>
  </XMI.content>
diff --git a/chalk/doc/hooks b/chalk/doc/hooks
index 83959a962..da3d4e534 100644
--- a/chalk/doc/hooks
+++ b/chalk/doc/hooks
@@ -13,7 +13,7 @@ Thus, if a paint device is of a certain color model, certain GUI things
 must be activated and deactived when that paint device becomes active.
 
 A paint op may need to knwo something about the layer it is going to paint
-on: it is not sufficient to generate a tqmask and have that composited by
+on: it is not sufficient to generate a mask and have that composited by
 the color strategy because the footprint may be determined by the deposit
 and height field that is already present.
 
diff --git a/chalk/doc/sdk b/chalk/doc/sdk
index b811d80a6..a8b310e62 100644
--- a/chalk/doc/sdk
+++ b/chalk/doc/sdk
@@ -6,5 +6,5 @@ not include anything from chalk/core, but only the headers from chalk/sdk.
 Problem: creating new paint devices, layers and images. You cannot, obviously,
 instantiate an interface, and we should not, equally obvious, code against 
 implementations. The solution is a factory class that is made available to
-the plugin when it is created -- i.e, the tqparent class of a plugin should
+the plugin when it is created -- i.e, the parent class of a plugin should
 implement the various factory interfaces for paint devices, images and layers.
diff --git a/chalk/doc/selections b/chalk/doc/selections
index bdcdaa034..32bffe498 100644
--- a/chalk/doc/selections
+++ b/chalk/doc/selections
@@ -5,7 +5,7 @@ class and the associated rectangular marque rendering code. If you
 find anything connected with that after I finish coding the new
 selections scheme, it's something I forgot.
 
-Selections in Chalk are special paint devices as big as their tqparent
+Selections in Chalk are special paint devices as big as their parent
 layer. The selection has the alpha colour strategy. The alpha channel
 contains the selectedness of a pixel. It is not a binary value, but a scale,
 hardcoded to 8 bits unsigned
@@ -34,7 +34,7 @@ selected. Values in between are semi selected
 
 Other representations of selections are possible: the selection for a
 particular rect is rendered as a separate step in
-KisImage::renderToProjection. I like the tqmask type rendering, but
+KisImage::renderToProjection. I like the mask type rendering, but
 someone else might want to provide an optional marque-rendering.
 
 TODO: * enable kconfig option to select between renderings.
@@ -74,7 +74,7 @@ Use cases: fills (gradient, pattern, color), filtering.
 
 Fills are easiest implemented by creating a filled paint device for
 the rect covered by the selection, and then, while composting the fill
-with the target layer, pass the tqmask to the compositing loop, and skip
+with the target layer, pass the mask to the compositing loop, and skip
 un-selected pixels. 
 
 XXX: Discuss whether this is true
diff --git a/chalk/plugins/filters/blur/blur.cc b/chalk/plugins/filters/blur/blur.cc
index bcf798b9e..69bac7b1d 100644
--- a/chalk/plugins/filters/blur/blur.cc
+++ b/chalk/plugins/filters/blur/blur.cc
@@ -27,8 +27,8 @@
 typedef KGenericFactory<BlurFilterPlugin> BlurFilterPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkblurfilter, BlurFilterPluginFactory( "chalk" ) )
 
-BlurFilterPlugin::BlurFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+BlurFilterPlugin::BlurFilterPlugin(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(BlurFilterPluginFactory::instance());
 
@@ -36,11 +36,11 @@ BlurFilterPlugin::BlurFilterPlugin(TQObject *tqparent, const char *name, const T
     kdDebug(41006) << "Extensions Convolution Filters plugin. Class: "
           << className()
           << ", Parent: "
-          << tqparent -> className()
+          << parent -> className()
           << "\n";
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisBlurFilter());
     }
 }
diff --git a/chalk/plugins/filters/blur/blur.h b/chalk/plugins/filters/blur/blur.h
index 8ce31706e..239d05d0b 100644
--- a/chalk/plugins/filters/blur/blur.h
+++ b/chalk/plugins/filters/blur/blur.h
@@ -30,7 +30,7 @@
 class BlurFilterPlugin : public KParts::Plugin
 {
 public:
-    BlurFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    BlurFilterPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~BlurFilterPlugin();
 };
 
diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cc
index 8709c073b..0217b7e17 100644
--- a/chalk/plugins/filters/blur/kis_blur_filter.cc
+++ b/chalk/plugins/filters/blur/kis_blur_filter.cc
@@ -56,9 +56,9 @@ KisBlurFilter::KisBlurFilter() : KisFilter(id(), "blur", i18n("&Blur..."))
 {
 }
 
-KisFilterConfigWidget * KisBlurFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP )
+KisFilterConfigWidget * KisBlurFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP )
 {
-    return new KisWdgBlur(this, tqparent, "configuration of color to alpha");
+    return new KisWdgBlur(this, parent, "configuration of color to alpha");
 }
 
 KisFilterConfiguration* KisBlurFilter::configuration(TQWidget* w)
@@ -110,19 +110,19 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte
             kas = new KisAutobrushCircleShape(width, height, hFade, vFade);
             break;
     }
-    TQImage tqmask;
-    kas->createBrush(&tqmask);
+    TQImage mask;
+    kas->createBrush(&mask);
 
-    tqmask.convertDepth(1);
+    mask.convertDepth(1);
 
     if( rotate != 0)
     {
         TQWMatrix m;
         m.rotate( rotate );
-        tqmask = tqmask.xForm( m );
-        if( (tqmask.height() & 1) || tqmask.width() & 1)
+        mask = mask.xForm( m );
+        if( (mask.height() & 1) || mask.width() & 1)
         {
-            tqmask.smoothScale( tqmask.width() + !(tqmask.width() & 1), tqmask.height() + !(tqmask.height() & 1) );
+            mask.smoothScale( mask.width() + !(mask.width() & 1), mask.height() + !(mask.height() & 1) );
         }
     }
 
@@ -130,7 +130,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte
     if (m_progressDisplay)
         m_progressDisplay->setSubject( &painter, true, true );
 
-    KisKernelSP kernel = kernelFromTQImage(tqmask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage
+    KisKernelSP kernel = kernelFromTQImage(mask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage
 
     painter.applyMatrix(kernel, rect.x(), rect.y(), rect.width(), rect.height(), BORDER_REPEAT, KisChannelInfo::FLAG_COLOR_AND_ALPHA);
 
diff --git a/chalk/plugins/filters/blur/kis_blur_filter.h b/chalk/plugins/filters/blur/kis_blur_filter.h
index 886551864..b1d2a65a1 100644
--- a/chalk/plugins/filters/blur/kis_blur_filter.h
+++ b/chalk/plugins/filters/blur/kis_blur_filter.h
@@ -42,7 +42,7 @@ class KisBlurFilter : public KisFilter
         virtual bool supportsThreading() { return false; }
         virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; };
     public:
-        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
         virtual KisFilterConfiguration* configuration(TQWidget*);
 };
 
diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cc b/chalk/plugins/filters/blur/kis_wdg_blur.cc
index bfed7474c..dc836971f 100644
--- a/chalk/plugins/filters/blur/kis_wdg_blur.cc
+++ b/chalk/plugins/filters/blur/kis_wdg_blur.cc
@@ -32,7 +32,7 @@
 
 #include "wdgblur.h"
 
-KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name )
+KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name )
 {
     Q_UNUSED( nfilter );
 
diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.h b/chalk/plugins/filters/blur/kis_wdg_blur.h
index c0cc4834f..f305df252 100644
--- a/chalk/plugins/filters/blur/kis_wdg_blur.h
+++ b/chalk/plugins/filters/blur/kis_wdg_blur.h
@@ -35,7 +35,7 @@ class KisWdgBlur : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisWdgBlur( KisFilter* nfilter, TQWidget * tqparent, const char * name);
+        KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name);
         inline WdgBlur* widget() { return m_widget; };
         virtual void setConfiguration(KisFilterConfiguration*);
     private slots:
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cc
index 455889d5a..4ae92469c 100644
--- a/chalk/plugins/filters/bumpmap/bumpmap.cc
+++ b/chalk/plugins/filters/bumpmap/bumpmap.cc
@@ -72,14 +72,14 @@
 typedef KGenericFactory<ChalkBumpmap> ChalkBumpmapFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkbumpmap, ChalkBumpmapFactory( "chalk" ) )
 
-ChalkBumpmap::ChalkBumpmap(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkBumpmap::ChalkBumpmap(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkBumpmapFactory::instance());
 
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisFilterBumpmap());
     }
 }
@@ -347,9 +347,9 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi
 
 }
 
-KisFilterConfigWidget * KisFilterBumpmap::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev)
+KisFilterConfigWidget * KisFilterBumpmap::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev)
 {
-    KisBumpmapConfigWidget * w = new KisBumpmapConfigWidget(this, dev, tqparent);
+    KisBumpmapConfigWidget * w = new KisBumpmapConfigWidget(this, dev, parent);
 
 
     return w;
@@ -456,8 +456,8 @@ TQString KisBumpmapConfiguration::toString()
     return KisFilterConfiguration::toString();
 }
 
-KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name, WFlags f)
-    : KisFilterConfigWidget(tqparent, name, f)
+KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev, TQWidget * parent, const char * name, WFlags f)
+    : KisFilterConfigWidget(parent, name, f)
 {
     m_page = new WdgBumpmap(this);
     TQHBoxLayout * l = new TQHBoxLayout(this);
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.h b/chalk/plugins/filters/bumpmap/bumpmap.h
index b1c16b1aa..efaf4058f 100644
--- a/chalk/plugins/filters/bumpmap/bumpmap.h
+++ b/chalk/plugins/filters/bumpmap/bumpmap.h
@@ -49,7 +49,7 @@ using namespace chalk;
 class ChalkBumpmap : public KParts::Plugin
 {
 public:
-    ChalkBumpmap(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkBumpmap(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkBumpmap();
 };
 
@@ -76,7 +76,7 @@ public:
     virtual bool supportsAdjustmentLayers() { return false; }
     virtual bool supportsThreading() { return false; }
 
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration * configuration(TQWidget*);
     virtual KisFilterConfiguration * configuration();
 
@@ -116,7 +116,7 @@ class KisBumpmapConfigWidget : public KisFilterConfigWidget {
   TQ_OBJECT
 
 public:
-    KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name = 0, WFlags f = 0 );
+    KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, TQWidget * parent, const char * name = 0, WFlags f = 0 );
     virtual ~KisBumpmapConfigWidget() {};
 
     KisBumpmapConfiguration * config();
diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h
index 8d6a24f65..abd1bb66c 100644
--- a/chalk/plugins/filters/cimg/CImg.h
+++ b/chalk/plugins/filters/cimg/CImg.h
@@ -659,7 +659,7 @@ namespace cimg_library {
       - \b CImgDisplayException : Thrown when an error occured when trying to display an image in a window.
       This exception is thrown when image display request cannot be satisfied.
       
-      The tqparent class CImgException may be thrown itself when errors that cannot be classified in one of
+      The parent class CImgException may be thrown itself when errors that cannot be classified in one of
       the above type occur. It is recommended not to throw CImgExceptions yourself, since there are normally
       reserved to %CImg Library functions.
       \b CImgInstanceException, \b CImgArgumentException, \b CImgIOException and \b CImgDisplayException are simple
@@ -4425,11 +4425,11 @@ namespace cimg_library {
         pthread_mutex_lock(cimg::X11attr().mutex);
         for (unsigned int i=0; i<cimg::X11attr().nb_wins; i++) {
           const unsigned int xevent_type = (cimg::X11attr().wins[i]->events)&3;
-          const unsigned int etqmask =
+          const unsigned int emask =
             ((xevent_type>=1)?ExposureMask|StructureNotifyMask:0)|
             ((xevent_type>=2)?ButtonPressMask|KeyPressMask|PointerMotionMask|LeaveWindowMask:0)|
             ((xevent_type>=3)?ButtonReleaseMask|KeyReleaseMask:0);
-          XSelectInput(cimg::X11attr().display,cimg::X11attr().wins[i]->window,etqmask);
+          XSelectInput(cimg::X11attr().display,cimg::X11attr().wins[i]->window,emask);
         }
         bool event_flag = XCheckTypedEvent(cimg::X11attr().display, ClientMessage, &event);
         if (!event_flag) event_flag = XCheckMaskEvent(cimg::X11attr().display,
@@ -4599,10 +4599,10 @@ namespace cimg_library {
         do {
           pthread_mutex_lock(cimg::X11attr().mutex);
           const unsigned int 
-            etqmask = ExposureMask|StructureNotifyMask|
+            emask = ExposureMask|StructureNotifyMask|
             ((events>=2)?ButtonPressMask|KeyPressMask|PointerMotionMask|LeaveWindowMask:0)|
             ((events>=3)?ButtonReleaseMask|KeyReleaseMask:0);
-          XSelectInput(cimg::X11attr().display,window,etqmask);
+          XSelectInput(cimg::X11attr().display,window,emask);
           XPeekEvent(cimg::X11attr().display,&event);
           cimg::X11attr().thread_finished = false;
           pthread_mutex_unlock(cimg::X11attr().mutex);
@@ -7867,13 +7867,13 @@ namespace cimg_library {
     CImg get_resize_halfXY() const {
       typedef typename cimg::largest<T,float>::type ftype;
       if (is_empty()) return CImg<T>();
-      CImg<ftype> tqmask = CImg<ftype>::matrix(0.07842776544f, 0.1231940459f, 0.07842776544f,
+      CImg<ftype> mask = CImg<ftype>::matrix(0.07842776544f, 0.1231940459f, 0.07842776544f,
 					     0.1231940459f,  0.1935127547f, 0.1231940459f,
 					     0.07842776544f, 0.1231940459f, 0.07842776544f);
       CImg_3x3x1(I,ftype);
       CImg dest(width/2,height/2,depth,dim);
       cimg_mapZV(*this,z,k) cimg_map3x3x1(*this,x,y,z,k,I) 
-	if (x%2 && y%2) dest(x/2,y/2,z,k) = (T)cimg_conv3x3x1(I,tqmask);
+	if (x%2 && y%2) dest(x/2,y/2,z,k) = (T)cimg_conv3x3x1(I,mask);
       return dest;
     }
 
@@ -8816,7 +8816,7 @@ namespace cimg_library {
 	CImg_2x2x1(I,restype);
 	cimg_mapZV(*this,z,k) cimg_map2x2x1(*this,x,y,z,k,I) { res[0](x,y,0,k) = Inc-Icc; res[1](x,y,z,k) = Icn-Icc; }
       } break;
-      case 2: { // using Sobel tqmask
+      case 2: { // using Sobel mask
 	CImg_3x3x1(I,restype);
 	const float a = 1, b = 2;
 	cimg_mapZV(*this,z,k) cimg_map3x3x1(*this,x,y,z,k,I) {
@@ -8824,7 +8824,7 @@ namespace cimg_library {
 	  res[1](x,y,z,k) = -a*Ipp-b*Icp-a*Inp+a*Ipn+b*Icn+a*Inn;
 	}
       } break;
-      case 3: { // using rotation invariant tqmask
+      case 3: { // using rotation invariant mask
 	CImg_3x3x1(I,restype);     
 	const float a = (float)(0.25*(2-std::sqrt(2.0))), b = (float)(0.5f*(std::sqrt(2.0)-1));
 	cimg_mapZV(*this,z,k) cimg_map3x3x1(*this,x,y,z,k,I) {
@@ -9825,42 +9825,42 @@ namespace cimg_library {
     //! Draw a masked sprite image in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0).
     /**
        \param sprite = sprite image.
-       \param tqmask = tqmask image.
+       \param mask = mask image.
        \param x0 = X-coordinate of the sprite position in the instance image.
        \param y0 = Y-coordinate of the sprite position in the instance image.
        \param z0 = Z-coordinate of the sprite position in the instance image.
        \param v0 = V-coordinate of the sprite position in the instance image.
-       \param mask_valmax = Maximum pixel value of the tqmask image \c tqmask.
+       \param mask_valmax = Maximum pixel value of the mask image \c mask.
        \param opacity = opacity of the drawing.
-       \note Pixel values of \c tqmask set the opacity of the corresponding pixels in \c sprite.
+       \note Pixel values of \c mask set the opacity of the corresponding pixels in \c sprite.
        \note Clipping is supported.
-       \note Dimensions along x,y and z of \c sprite and \c tqmask must be the same.
+       \note Dimensions along x,y and z of \c sprite and \c mask must be the same.
     **/
-    template<typename ti,typename tm> CImg& draw_image(const CImg<ti>& sprite,const CImg<tm>& tqmask,
+    template<typename ti,typename tm> CImg& draw_image(const CImg<ti>& sprite,const CImg<tm>& mask,
                                                        const int x0=0,const int y0=0,const int z0=0,const int v0=0,
                                                        const tm mask_valmax=1,const float opacity=1) {
       if (!is_empty()) {
 	if (sprite.is_empty())
 	  throw CImgArgumentException("CImg<%s>::draw_image() : Specified sprite image (%u,%u,%u,%u,%p) is empty.",
 				      pixel_type(),sprite.width,sprite.height,sprite.depth,sprite.dim,sprite.data);
-	if (tqmask.is_empty())
-	  throw CImgArgumentException("CImg<%s>::draw_image() : Specified tqmask image (%u,%u,%u,%u,%p) is empty.",
-				      pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data);
-	if ((void*)this==(void*)&sprite) return draw_image(CImg<T>(sprite),tqmask,x0,y0,z0,v0);
-	if(tqmask.width!=sprite.width || tqmask.height!=sprite.height || tqmask.depth!=sprite.depth)
+	if (mask.is_empty())
+	  throw CImgArgumentException("CImg<%s>::draw_image() : Specified mask image (%u,%u,%u,%u,%p) is empty.",
+				      pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data);
+	if ((void*)this==(void*)&sprite) return draw_image(CImg<T>(sprite),mask,x0,y0,z0,v0);
+	if(mask.width!=sprite.width || mask.height!=sprite.height || mask.depth!=sprite.depth)
 	  throw CImgArgumentException("CImg<%s>::draw_image() : Mask dimension is (%u,%u,%u,%u), while sprite is (%u,%u,%u,%u)",
-				      pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim);
+				      pixel_type(),mask.width,mask.height,mask.depth,mask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim);
 	const bool bx=(x0<0), by=(y0<0), bz=(z0<0), bv=(v0<0);
 	const int
 	  lX = sprite.dimx() - (x0+sprite.dimx()>dimx()?x0+sprite.dimx()-dimx():0) + (bx?x0:0),
 	  lY = sprite.dimy() - (y0+sprite.dimy()>dimy()?y0+sprite.dimy()-dimy():0) + (by?y0:0),
 	  lZ = sprite.dimz() - (z0+sprite.dimz()>dimz()?z0+sprite.dimz()-dimz():0) + (bz?z0:0),      
 	  lV = sprite.dimv() - (v0+sprite.dimv()>dimv()?v0+sprite.dimv()-dimv():0) + (bv?v0:0);    
-	const int coff = -(bx?x0:0)-(by?y0*tqmask.dimx():0)-(bz?z0*tqmask.dimx()*tqmask.dimy():0)-
-	  (bv?v0*tqmask.dimx()*tqmask.dimy()*tqmask.dimz():0),
-	  ssize = tqmask.dimx()*tqmask.dimy()*tqmask.dimz();
+	const int coff = -(bx?x0:0)-(by?y0*mask.dimx():0)-(bz?z0*mask.dimx()*mask.dimy():0)-
+	  (bv?v0*mask.dimx()*mask.dimy()*mask.dimz():0),
+	  ssize = mask.dimx()*mask.dimy()*mask.dimz();
 	const ti *ptrs = sprite.ptr() + coff;
-	const tm *ptrm = tqmask.ptr() + coff;
+	const tm *ptrm = mask.ptr() + coff;
 	const unsigned int
 	  offX = width-lX, soffX = sprite.width-lX,
 	  offY = width*(height-lY), soffY = sprite.width*(sprite.height-lY),
@@ -9868,7 +9868,7 @@ namespace cimg_library {
 	T *ptrd = ptr(x0<0?0:x0,y0<0?0:y0,z0<0?0:z0,v0<0?0:v0);
 	if (lX>0 && lY>0 && lZ>0 && lV>0)
 	  for (int v=0; v<lV; v++) {
-	    ptrm = tqmask.data + (ptrm - tqmask.data)%ssize;
+	    ptrm = mask.data + (ptrm - mask.data)%ssize;
 	    for (int z=0; z<lZ; z++) {
 	      for (int y=0; y<lY; y++) {
 		for (int x=0; x<lX; x++) {
@@ -10785,12 +10785,12 @@ namespace cimg_library {
         case '\t': x+=4*font[' '].width; break;
         default: if (c<font.size) {
             letter = font[c];
-            const CImg& tqmask = (c+256)<(int)font.size?font[c+256]:font[c];
+            const CImg& mask = (c+256)<(int)font.size?font[c+256]:font[c];
             if (fgcolor) for (unsigned int p=0; p<letter.width*letter.height; p++) 
-	      if (tqmask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=(T)(letter(p,0,0,k)*fgcolor[k]);
+	      if (mask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=(T)(letter(p,0,0,k)*fgcolor[k]);
             if (bgcolor) for (unsigned int p=0; p<letter.width*letter.height; p++)
-	      if (!tqmask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=bgcolor[k];
-            if (!bgcolor && font.size>=512) draw_image(letter,tqmask,x,y,0,0,(T)1,opacity); else draw_image(letter,x,y,0,0,opacity);
+	      if (!mask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=bgcolor[k];
+            if (!bgcolor && font.size>=512) draw_image(letter,mask,x,y,0,0,(T)1,opacity); else draw_image(letter,x,y,0,0,opacity);
             x+=letter.width;
           }
           break;
@@ -11163,11 +11163,11 @@ namespace cimg_library {
        \param y = Y-coordinate of the starting point of the region to fill.
        \param z = Z-coordinate of the starting point of the region to fill.
        \param color = an array of dimv() values of type \c T, defining the drawing color.
-       \param region = image that will contain the tqmask of the filled region tqmask, as an output.
+       \param region = image that will contain the mask of the filled region mask, as an output.
        \param sigma = tolerance concerning neighborhood values.
        \param opacity = opacity of the drawing.
 
-       \return \p region is initialized with the binary tqmask of the filled region.
+       \return \p region is initialized with the binary mask of the filled region.
     **/
     template<typename t> CImg& draw_fill(const int x,const int y,const int z,
                                          const T *const color, CImg<t>& region,const float sigma=0,
@@ -11963,107 +11963,107 @@ namespace cimg_library {
     //@{
     //----------------------------
   
-    //! Return the correlation of the image by a tqmask.
+    //! Return the correlation of the image by a mask.
     /**
-       The result \p res of the correlation of an image \p img by a tqmask \p tqmask is defined to be :
+       The result \p res of the correlation of an image \p img by a mask \p mask is defined to be :
        
-       res(x,y,z) = sum_{i,j,k} img(x+i,y+j,z+k)*tqmask(i,j,k)
+       res(x,y,z) = sum_{i,j,k} img(x+i,y+j,z+k)*mask(i,j,k)
 
-       \param tqmask = the correlation kernel.
+       \param mask = the correlation kernel.
        \param cond = the border condition type (0=zero, 1=dirichlet)
        \param weighted_correl = enable local normalization.
     **/
     template<typename t> CImg<typename cimg::largest<T,t>::type> 
-    get_correlate(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_correl=false) const {
+    get_correlate(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_correl=false) const {
       typedef typename cimg::largest<T,t>::type restype;
       typedef typename cimg::largest<t,float>::type fftype;
       typedef typename cimg::largest<T,fftype>::type ftype;
       
       if (is_empty()) return CImg<restype>();
-      if (tqmask.is_empty() || tqmask.dim!=1)
-	throw CImgArgumentException("CImg<%s>::get_correlate() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.",
-				    pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data);
+      if (mask.is_empty() || mask.dim!=1)
+	throw CImgArgumentException("CImg<%s>::get_correlate() : Specified mask (%u,%u,%u,%u,%p) is not scalar.",
+				    pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data);
       CImg<restype> dest(*this,false);
-      if (cond && tqmask.width==tqmask.height && ((tqmask.depth==1 && tqmask.width<=5) || (tqmask.depth==tqmask.width && tqmask.width<=3))) {
-        // A special optimization is done for 2x2,3x3,4x4,5x5,2x2x2 and 3x3x3 tqmask (with cond=1)
-        switch (tqmask.depth) {
+      if (cond && mask.width==mask.height && ((mask.depth==1 && mask.width<=5) || (mask.depth==mask.width && mask.width<=3))) {
+        // A special optimization is done for 2x2,3x3,4x4,5x5,2x2x2 and 3x3x3 mask (with cond=1)
+        switch (mask.depth) {
         case 3: {
           CImg_3x3x3(I,T);
-          if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x3(I,tqmask);
+          if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x3(I,mask);
           else cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) {
             const double norm = (double)cimg_squaresum3x3x3(I);
-            dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x3(I,tqmask)/std::sqrt(norm)):0;
+            dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x3(I,mask)/std::sqrt(norm)):0;
           }
         } break;
         case 2: {
           CImg_2x2x2(I,T);
-          if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x2(I,tqmask);
+          if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x2(I,mask);
           else cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) {
             const double norm = (double)cimg_squaresum2x2x2(I);
-            dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x2(I,tqmask)/std::sqrt(norm)):0;
+            dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x2(I,mask)/std::sqrt(norm)):0;
           }
         } break;
         default:
         case 1:
-          switch (tqmask.width) {
+          switch (mask.width) {
           case 5: {
             CImg_5x5x1(I,T);
-            if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr5x5x1(I,tqmask);
+            if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr5x5x1(I,mask);
             else cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) {
               const double norm = (double)cimg_squaresum5x5x1(I);
-              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr5x5x1(I,tqmask)/std::sqrt(norm)):0;
+              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr5x5x1(I,mask)/std::sqrt(norm)):0;
             }            
           } break;          
           case 4: {
             CImg_4x4x1(I,T);
-            if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr4x4x1(I,tqmask);
+            if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr4x4x1(I,mask);
             else cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) {
               const double norm = (double)cimg_squaresum4x4x1(I);
-              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr4x4x1(I,tqmask)/std::sqrt(norm)):0;
+              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr4x4x1(I,mask)/std::sqrt(norm)):0;
             }            
           } break;              
           case 3: {
             CImg_3x3x1(I,T);
-            if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x1(I,tqmask);
+            if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x1(I,mask);
             else cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) {
               const double norm = (double)cimg_squaresum3x3x1(I);
-              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x1(I,tqmask)/std::sqrt(norm)):0;
+              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x1(I,mask)/std::sqrt(norm)):0;
             }            
           } break;   
           case 2: {
             CImg_2x2x1(I,T);
-            if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x1(I,tqmask);
+            if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x1(I,mask);
             else cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) {
               const double norm = (double)cimg_squaresum2x2x1(I);
-              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x1(I,tqmask)/std::sqrt(norm)):0;
+              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x1(I,mask)/std::sqrt(norm)):0;
             }            
           } break;  
-          case 1: dest = tqmask(0)*(*this); break;
+          case 1: dest = mask(0)*(*this); break;
           }
         }
       } else { 
         // Generic version for other masks      
-        const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2);
+        const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2, fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2);
         cimg_mapV(*this,v) 
           if (!weighted_correl) {	// Classical correlation
             for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) {
               ftype val = 0;
               for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-                val+= (*this)(x+xm,y+ym,z+zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                val+= (*this)(x+xm,y+ym,z+zm,v)*mask(cxm+xm,cym+ym,czm+zm,0);
               dest(x,y,z,v)=(restype)val;
             }
             if (cond) cimg_mapYZV(*this,y,z,v)
               for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
                 ftype val = 0;
                 for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-                  val+= pix3d(x+xm,y+ym,z+zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                  val+= pix3d(x+xm,y+ym,z+zm,v)*mask(cxm+xm,cym+ym,czm+zm,0);
                 dest(x,y,z,v)=(restype)val;
               }
             else cimg_mapYZV(*this,y,z,v)
               for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
                 ftype val = 0;
                 for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++)  for (int xm=-cxm; xm<=fxm; xm++)
-                  val+= pix3d(x+xm,y+ym,z+zm,v,0)*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                  val+= pix3d(x+xm,y+ym,z+zm,v,0)*mask(cxm+xm,cym+ym,czm+zm,0);
                 dest(x,y,z,v)=(restype)val;
               }
           } else {	// Weighted correlation
@@ -12071,7 +12071,7 @@ namespace cimg_library {
               ftype val = 0, norm = 0;
               for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) {
                 const T cval = (*this)(x+xm,y+ym,z+zm,v);
-                val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                val+= cval*mask(cxm+xm,cym+ym,czm+zm,0);
                 norm+= cval*cval;
               }
               dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt((double)norm)):0;
@@ -12081,7 +12081,7 @@ namespace cimg_library {
                 ftype val = 0, norm = 0;
                 for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) {
                   const T cval = pix3d(x+xm,y+ym,z+zm,v);
-                  val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                  val+= cval*mask(cxm+xm,cym+ym,czm+zm,0);
                   norm+=cval*cval;
                 }
                 dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt((double)norm)):0;
@@ -12091,7 +12091,7 @@ namespace cimg_library {
                 ftype val = 0, norm = 0;
                 for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) {
                   const T cval = pix3d(x+xm,y+ym,z+zm,v,0);
-                  val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                  val+= cval*mask(cxm+xm,cym+ym,czm+zm,0);
                   norm+= cval*cval;
                 }
                 dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt((double)norm)):0;
@@ -12102,115 +12102,115 @@ namespace cimg_library {
     }
 
 
-    //! Correlate the image by a tqmask
+    //! Correlate the image by a mask
     /**
        This is the in-place version of get_correlate.
        \see get_correlate
     **/
-    template<typename t> CImg& correlate(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_correl=false) { 
-      return get_correlate(tqmask,cond,weighted_correl).swap(*this); 
+    template<typename t> CImg& correlate(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_correl=false) { 
+      return get_correlate(mask,cond,weighted_correl).swap(*this); 
     }
   
-    //! Return the convolution of the image by a tqmask
+    //! Return the convolution of the image by a mask
     /**
-       The result \p res of the convolution of an image \p img by a tqmask \p tqmask is defined to be :
+       The result \p res of the convolution of an image \p img by a mask \p mask is defined to be :
        
-       res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*tqmask(i,j,k)
+       res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*mask(i,j,k)
 
-       \param tqmask = the correlation kernel.
+       \param mask = the correlation kernel.
        \param cond = the border condition type (0=zero, 1=dirichlet)
        \param weighted_convol = enable local normalization.
     **/
     template<typename t> CImg<typename cimg::largest<T,t>::type>
-    get_convolve(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_convol=false) const {
+    get_convolve(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_convol=false) const {
       typedef typename cimg::largest<T,t>::type restype;
       typedef typename cimg::largest<t,float>::type fftype;
       typedef typename cimg::largest<T,fftype>::type ftype;
       
       if (is_empty()) return CImg<restype>();
-      if (tqmask.is_empty() || tqmask.dim!=1)
-	throw CImgArgumentException("CImg<%s>::get_convolve() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.",
-				    pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data);
+      if (mask.is_empty() || mask.dim!=1)
+	throw CImgArgumentException("CImg<%s>::get_convolve() : Specified mask (%u,%u,%u,%u,%p) is not scalar.",
+				    pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data);
       CImg<restype> dest(*this,false);
-      if (cond && tqmask.width==tqmask.height && ((tqmask.depth==1 && tqmask.width<=5) || (tqmask.depth==tqmask.width && tqmask.width<=3))) { // optimized version
-        switch (tqmask.depth) {
+      if (cond && mask.width==mask.height && ((mask.depth==1 && mask.width<=5) || (mask.depth==mask.width && mask.width<=3))) { // optimized version
+        switch (mask.depth) {
         case 3: {
           CImg_3x3x3(I,T);
-          if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv3x3x3(I,tqmask);
+          if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv3x3x3(I,mask);
           else cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) {
             const double norm = (double)cimg_squaresum3x3x3(I);
-            dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x3(I,tqmask)/std::sqrt(norm)):0;
+            dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x3(I,mask)/std::sqrt(norm)):0;
           }
         } break;
         case 2: {
           CImg_2x2x2(I,T);
-          if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv2x2x2(I,tqmask);
+          if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv2x2x2(I,mask);
           else cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) {
             const double norm = (double)cimg_squaresum2x2x2(I);
-            dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x2(I,tqmask)/std::sqrt(norm)):0;
+            dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x2(I,mask)/std::sqrt(norm)):0;
           }
         } break;
         default:
         case 1:
-          switch (tqmask.width) {
+          switch (mask.width) {
           case 5: {
             CImg_5x5x1(I,T);
-            if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv5x5x1(I,tqmask);
+            if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv5x5x1(I,mask);
             else cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) {
               const double norm = (double)cimg_squaresum5x5x1(I);
-              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv5x5x1(I,tqmask)/std::sqrt(norm)):0;
+              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv5x5x1(I,mask)/std::sqrt(norm)):0;
             }            
           } break;          
           case 4: {
             CImg_4x4x1(I,T);
-            if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv4x4x1(I,tqmask);
+            if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv4x4x1(I,mask);
             else cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) {
               const double norm = (double)cimg_squaresum4x4x1(I);
-              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv4x4x1(I,tqmask)/std::sqrt(norm)):0;
+              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv4x4x1(I,mask)/std::sqrt(norm)):0;
             }
           } break;              
           case 3: {
             CImg_3x3x1(I,T);
-            if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv3x3x1(I,tqmask);
+            if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv3x3x1(I,mask);
             else cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) {
               const double norm = (double)cimg_squaresum3x3x1(I);
-              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x1(I,tqmask)/std::sqrt(norm)):0;
+              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x1(I,mask)/std::sqrt(norm)):0;
             }            
           } break;   
           case 2: {
             CImg_2x2x1(I,T);
-            if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv2x2x1(I,tqmask);
+            if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv2x2x1(I,mask);
             else cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) {
               const double norm = (double)cimg_squaresum2x2x1(I);
-              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x1(I,tqmask)/std::sqrt(norm)):0;
+              dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x1(I,mask)/std::sqrt(norm)):0;
             } 
           } break;  
-          case 1: dest = tqmask(0)*(*this); break;
+          case 1: dest = mask(0)*(*this); break;
           }
         }
       } else { // generic version
           
-        const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2);
+        const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2, fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2);
         cimg_mapV(*this,v) 
           if (!weighted_convol) {	// Classical convolution
             for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) {
               ftype val = 0;
               for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-                val+= (*this)(x-xm,y-ym,z-zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                val+= (*this)(x-xm,y-ym,z-zm,v)*mask(cxm+xm,cym+ym,czm+zm,0);
               dest(x,y,z,v)=(restype)val;
             }
             if (cond) cimg_mapYZV(*this,y,z,v)
               for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
                 ftype val = 0;
                 for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-                  val+= pix3d(x-xm,y-ym,z-zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                  val+= pix3d(x-xm,y-ym,z-zm,v)*mask(cxm+xm,cym+ym,czm+zm,0);
                 dest(x,y,z,v)=(restype)val;
               }
             else cimg_mapYZV(*this,y,z,v)
               for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
                 ftype val = 0;
                 for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++)  for (int xm=-cxm; xm<=fxm; xm++)
-                  val+= pix3d(x-xm,y-ym,z-zm,v,0)*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                  val+= pix3d(x-xm,y-ym,z-zm,v,0)*mask(cxm+xm,cym+ym,czm+zm,0);
                 dest(x,y,z,v)=(restype)val;
               }
           } else {	// Weighted convolution
@@ -12218,7 +12218,7 @@ namespace cimg_library {
               ftype val = 0, norm = 0;
               for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) {
                 const T cval = (*this)(x-xm,y-ym,z-zm,v);
-                val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                val+= cval*mask(cxm+xm,cym+ym,czm+zm,0);
                 norm+= cval*cval;
               }
               dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt(norm)):0;
@@ -12228,7 +12228,7 @@ namespace cimg_library {
                 ftype val = 0, norm = 0;
                 for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) {
                   const T cval = pix3d(x-xm,y-ym,z-zm,v);
-                  val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                  val+= cval*mask(cxm+xm,cym+ym,czm+zm,0);
                   norm+=cval*cval;
                 }
                 dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt(norm)):0;
@@ -12238,7 +12238,7 @@ namespace cimg_library {
                 double val = 0, norm = 0;
                 for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++)  for (int xm=-cxm; xm<=fxm; xm++) {
                   const T cval = pix3d(x-xm,y-ym,z-zm,v,0);
-                  val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0);
+                  val+= cval*mask(cxm+xm,cym+ym,czm+zm,0);
                   norm+= cval*cval;
                 }
                 dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt(norm)):0;
@@ -12248,46 +12248,46 @@ namespace cimg_library {
       return dest;
     }
   
-    //! Convolve the image by a tqmask
+    //! Convolve the image by a mask
     /**
        This is the in-place version of get_convolve().
        \see get_convolve()
     **/
-    template<typename t> CImg& convolve(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_convol=false) {
-      return get_convolve(tqmask,cond,weighted_convol).swap(*this); 
+    template<typename t> CImg& convolve(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_convol=false) {
+      return get_convolve(mask,cond,weighted_convol).swap(*this); 
     }
 
     //! Return the erosion of the image by a structuring element.
     template<typename t> CImg<typename cimg::largest<T,t>::type> 
-    get_erode(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_erosion=false) const {
+    get_erode(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_erosion=false) const {
       typedef typename cimg::largest<T,t>::type restype;
       if (is_empty()) return CImg<restype>();
-      if (tqmask.is_empty() || tqmask.dim!=1)
-	throw CImgArgumentException("CImg<%s>::get_erosion() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.",
-				    pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data);
+      if (mask.is_empty() || mask.dim!=1)
+	throw CImgArgumentException("CImg<%s>::get_erosion() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.",
+				    pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data);
       CImg<restype> dest(*this,false);
-      const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2,
-	fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2);
+      const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2,
+	fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2);
       cimg_mapV(*this,v) 
 	if (!weighted_erosion) {	// Classical erosion
 	  for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) {
 	    restype foo, min_val = cimg::get_type_max(foo);
 	    for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-	      if (tqmask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)(*this)(x+xm,y+ym,z+zm,v),min_val);
+	      if (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)(*this)(x+xm,y+ym,z+zm,v),min_val);
 	    dest(x,y,z,v)=min_val;
 	  }
 	  if (cond) cimg_mapYZV(*this,y,z,v)
 		      for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
 			restype foo, min_val = cimg::get_type_max(foo);
 			for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-			  if (tqmask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v),min_val);
+			  if (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v),min_val);
 			dest(x,y,z,v)=min_val;
 		      }
 	  else cimg_mapYZV(*this,y,z,v)
 		 for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
 		   restype foo, min_val = cimg::get_type_max(foo);
 		   for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-		     if (tqmask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v,0),min_val);
+		     if (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v,0),min_val);
 		   dest(x,y,z,v)=min_val;
 		 }
 	} else { // Weighted erosion
@@ -12295,21 +12295,21 @@ namespace cimg_library {
 	  for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) {
 	    restype foo, min_val = cimg::get_type_max(foo);
 	    for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-	      if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)((*this)(x+xm,y+ym,z+zm,v)+mval),min_val);
+	      if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)((*this)(x+xm,y+ym,z+zm,v)+mval),min_val);
 	    dest(x,y,z,v)=min_val;
 	  }
 	  if (cond) cimg_mapYZV(*this,y,z,v)
 		      for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
 			restype foo, min_val = cimg::get_type_max(foo);
 			for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-			  if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v)+mval),min_val);
+			  if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v)+mval),min_val);
 			dest(x,y,z,v)=min_val;
 		      }
 	  else cimg_mapYZV(*this,y,z,v)
 		 for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
 		   restype foo, min_val = cimg::get_type_max(foo);
 		   for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-		     if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v,0)+mval),min_val);
+		     if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v,0)+mval),min_val);
 		   dest(x,y,z,v)=min_val;
 		 }
 	}    
@@ -12321,14 +12321,14 @@ namespace cimg_library {
        This is the in-place version of get_erode().
        \see get_erode()
     **/
-    template<typename t> CImg& erode(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_erosion=false) {
-      return get_erode(tqmask,cond,weighted_erosion).swap(*this); 
+    template<typename t> CImg& erode(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_erosion=false) {
+      return get_erode(mask,cond,weighted_erosion).swap(*this); 
     }
 
     //! Erode the image by a square structuring element of size n
     CImg get_erode(const unsigned int n=1, const unsigned int cond=1) const {
-      static const CImg<T> tqmask(3,3,1,1,1);
-      return get_erode(tqmask,cond,false);      
+      static const CImg<T> mask(3,3,1,1,1);
+      return get_erode(mask,cond,false);      
     }
 
     //! Erode the image by a square structuring element of size n
@@ -12338,35 +12338,35 @@ namespace cimg_library {
 
     //! Return the dilatation of the image by a structuring element.
     template<typename t> CImg<typename cimg::largest<T,t>::type> 
-    get_dilate(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_dilatation=false) const {
+    get_dilate(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_dilatation=false) const {
       typedef typename cimg::largest<T,t>::type restype;
       if (is_empty()) return CImg<restype>();
-      if (tqmask.is_empty() || tqmask.dim!=1)
-	throw CImgArgumentException("CImg<%s>::get_dilate() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.",
-				    pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data);
+      if (mask.is_empty() || mask.dim!=1)
+	throw CImgArgumentException("CImg<%s>::get_dilate() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.",
+				    pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data);
       CImg<restype> dest(*this,false);
-      const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2,
-	fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2);
+      const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2,
+	fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2);
       cimg_mapV(*this,v) 
 	if (!weighted_dilatation) { // Classical dilatation
 	  for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) {
 	    restype foo, max_val = cimg::get_type_min(foo);
 	    for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-	      if (tqmask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)(*this)(x+xm,y+ym,z+zm,v),max_val);
+	      if (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)(*this)(x+xm,y+ym,z+zm,v),max_val);
 	    dest(x,y,z,v)=max_val;
 	  }
 	  if (cond) cimg_mapYZV(*this,y,z,v)
 		      for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
 			restype foo, max_val = cimg::get_type_min(foo);
 			for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-			  if (tqmask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v),max_val);
+			  if (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v),max_val);
 			dest(x,y,z,v)=max_val;
 		      }
 	  else cimg_mapYZV(*this,y,z,v)
 		 for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
 		   restype foo, max_val = cimg::get_type_min(foo);
 		   for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-		     if (tqmask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v,0),max_val);
+		     if (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v,0),max_val);
 		   dest(x,y,z,v)=max_val;
 		 }
 	} else { // Weighted dilatation
@@ -12374,21 +12374,21 @@ namespace cimg_library {
 	  for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) {
 	    restype foo, max_val = cimg::get_type_min(foo);
 	    for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-	      if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)((*this)(x+xm,y+ym,z+zm,v)-mval),max_val);
+	      if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)((*this)(x+xm,y+ym,z+zm,v)-mval),max_val);
 	    dest(x,y,z,v)=max_val;
 	  }
 	  if (cond) cimg_mapYZV(*this,y,z,v)
 		      for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
 			restype foo, max_val = cimg::get_type_min(foo);
 			for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-			  if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v)-mval),max_val);
+			  if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v)-mval),max_val);
 			dest(x,y,z,v)=max_val;
 		      }
 	  else cimg_mapYZV(*this,y,z,v)
 		 for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) {
 		   restype foo, max_val = cimg::get_type_min(foo);
 		   for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++)
-		     if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v,0)-mval),max_val);
+		     if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v,0)-mval),max_val);
 		   dest(x,y,z,v)=max_val;
 		 }
 	}    
@@ -12400,14 +12400,14 @@ namespace cimg_library {
        This is the in-place version of get_dilate().
        \see get_dilate()
     **/
-    template<typename t> CImg& dilate(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_dilatation=false) {
-      return get_dilate(tqmask,cond,weighted_dilatation).swap(*this); 
+    template<typename t> CImg& dilate(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_dilatation=false) {
+      return get_dilate(mask,cond,weighted_dilatation).swap(*this); 
     }
 
     //! Dilate the image by a square structuring element of size n
     CImg get_dilate(const unsigned int n=1, const unsigned int cond=1) const {
-      static const CImg<T> tqmask(3,3,1,1,1);
-      return get_dilate(tqmask,cond,false);      
+      static const CImg<T> mask(3,3,1,1,1);
+      return get_dilate(mask,cond,false);      
     }
 
     //! Dilate the image by a square structuring element of size n
@@ -14723,27 +14723,27 @@ namespace cimg_library {
       switch (bpp) {
       case 1: { // Monochrome
 	for (int y=res.height-1; y>=0; y--) { 
-	  unsigned char tqmask = 0x80, val = 0;
+	  unsigned char mask = 0x80, val = 0;
 	  cimg_mapX(res,x) {
-	    if (tqmask==0x80) val = *(ptrs++);
-	    const unsigned char *col = (unsigned char*)(palette+(val&tqmask?1:0));
+	    if (mask==0x80) val = *(ptrs++);
+	    const unsigned char *col = (unsigned char*)(palette+(val&mask?1:0));
 	    res(x,y,2) = (T)*(col++);
 	    res(x,y,1) = (T)*(col++);
 	    res(x,y,0) = (T)*(col++);
-	    tqmask = cimg::ror(tqmask);
+	    mask = cimg::ror(mask);
 	  } ptrs+=align; }
       } break;
       case 4: { // 16 colors
 	for (int y=res.height-1; y>=0; y--) { 
-	  unsigned char tqmask = 0xF0, val = 0;
+	  unsigned char mask = 0xF0, val = 0;
 	  cimg_mapX(res,x) {
-	    if (tqmask==0xF0) val = *(ptrs++);
-	    const unsigned char color = (tqmask<16)?(val&tqmask):((val&tqmask)>>4);
+	    if (mask==0xF0) val = *(ptrs++);
+	    const unsigned char color = (mask<16)?(val&mask):((val&mask)>>4);
 	    unsigned char *col = (unsigned char*)(palette+color);
 	    res(x,y,2) = (T)*(col++);
 	    res(x,y,1) = (T)*(col++);
 	    res(x,y,0) = (T)*(col++);
-	    tqmask = cimg::ror(tqmask,4);
+	    mask = cimg::ror(mask,4);
 	  } ptrs+=align; }
       } break;
       case 8: { //  256 colors
@@ -17670,9 +17670,9 @@ namespace cimg_library {
       for (unsigned int y=0; y<h; y++)
 	for (unsigned int x=0; x<256*w; x++) {
 	  m>>=1; if (!m) { m=0x80000000; val = *(ptr++); }
-	  CImg<T>& img = res[x/w], &tqmask = res[x/w+256];
+	  CImg<T>& img = res[x/w], &mask = res[x/w+256];
 	  unsigned int xm = x%w;
-	  img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = tqmask(xm,y,0) = (T)((val&m)?1:0);
+	  img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = mask(xm,y,0) = (T)((val&m)?1:0);
 	}
       if (variable_size) res.crop_font();
       if (paddingx || paddingy) cimgl_map(res,l) res[l].resize(res[l].dimx()+paddingx, res[l].dimy()+paddingy,1,-100,0);
diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cc
index dc074e7b5..665dfc098 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc
+++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cc
@@ -291,7 +291,7 @@ void get_geom(const char *geom, int &geom_w, int &geom_h)
 void KisCImgFilter::cleanup()
 {
     img0 = flow = G = dest = sum= W = CImg<>();
-    tqmask = CImg<uchar> ();
+    mask = CImg<uchar> ();
 }
 
 //----------------------------------------------------------------------------
@@ -351,45 +351,45 @@ bool KisCImgFilter::prepare_restore()
 
 bool KisCImgFilter::prepare_inpaint()
 {
-    const char *file_m         = NULL; //cimg_option("-m",(const char*)NULL,"Input inpainting tqmask");
+    const char *file_m         = NULL; //cimg_option("-m",(const char*)NULL,"Input inpainting mask");
     if (!file_m)
     {
         // XXX: Do KDE messagebox
-        // g_message ("You need to specify an inpainting tqmask (option '-m') !");
+        // g_message ("You need to specify an inpainting mask (option '-m') !");
         return false;
     }
 
-    const unsigned int dilate  = 0; //cimg_option("-dilate",0,"Inpainting tqmask dilatation");
+    const unsigned int dilate  = 0; //cimg_option("-dilate",0,"Inpainting mask dilatation");
     const unsigned int ip_init = 3; //cimg_option("-init",3,"Inpainting init (0=black, 1=white, 2=noise, 3=unchanged, 4=interpol)");
     if (cimg::strncasecmp("block",file_m,5))
-        tqmask = CImg<uchar>(file_m);
+        mask = CImg<uchar>(file_m);
     else {
         int l=16; std::sscanf(file_m,"block%d",&l);
-        tqmask = CImg<uchar>(img.width/l,img.height/l);
-        cimg_mapXY(tqmask,x,y) tqmask(x,y)=(x+y)%2;
+        mask = CImg<uchar>(img.width/l,img.height/l);
+        cimg_mapXY(mask,x,y) mask(x,y)=(x+y)%2;
     }
-    tqmask.resize(img.width,img.height,1,1);
-    if (dilate) tqmask.dilate(dilate);
+    mask.resize(img.width,img.height,1,1);
+    if (dilate) mask.dilate(dilate);
     switch (ip_init) {
-    case 0 : { cimg_mapXYV(img,x,y,k) if (tqmask(x,y)) img(x,y,k) = 0; } break;
-    case 1 : { cimg_mapXYV(img,x,y,k) if (tqmask(x,y)) img(x,y,k) = 255; } break;
-    case 2 : { cimg_mapXYV(img,x,y,k) if (tqmask(x,y)) img(x,y,k) = (float)(255*cimg::rand()); } break;
+    case 0 : { cimg_mapXYV(img,x,y,k) if (mask(x,y)) img(x,y,k) = 0; } break;
+    case 1 : { cimg_mapXYV(img,x,y,k) if (mask(x,y)) img(x,y,k) = 255; } break;
+    case 2 : { cimg_mapXYV(img,x,y,k) if (mask(x,y)) img(x,y,k) = (float)(255*cimg::rand()); } break;
     case 3 : break;
     case 4 : {
-        CImg<uchar> ttqmask(tqmask),nttqmask(ttqmask);
+        CImg<uchar> tmask(mask),ntmask(tmask);
         CImg_3x3(M,uchar);
         CImg_3x3(I,float);
-        while (CImgStats(nttqmask,false).max>0) {
-            cimg_map3x3(ttqmask,x,y,0,0,M) if (Mcc && (!Mpc || !Mnc || !Mcp || !Mcn)) {
+        while (CImgStats(ntmask,false).max>0) {
+            cimg_map3x3(tmask,x,y,0,0,M) if (Mcc && (!Mpc || !Mnc || !Mcp || !Mcn)) {
                 const float ccp = Mcp?0.0f:1.0f, cpc = Mpc?0.0f:1.0f,
                     cnc = Mnc?0.0f:1.0f, ccn = Mcn?0.0f:1.0f, csum = ccp + cpc + cnc + ccn;
                 cimg_mapV(img,k) {
                     cimg_get3x3(img,x,y,0,k,I);
                     img(x,y,k) = (ccp*Icp + cpc*Ipc + cnc*Inc + ccn*Icn)/csum;
                 }
-                nttqmask(x,y) = 0;
+                ntmask(x,y) = 0;
             }
-            ttqmask = nttqmask;
+            tmask = ntmask;
         }
     } break;
     default: break;
@@ -398,7 +398,7 @@ bool KisCImgFilter::prepare_inpaint()
     G = CImg<>(img.width,img.height,1,3,0);
     CImg_3x3(g,uchar);
     CImg_3x3(I,float);
-    cimg_map3x3(tqmask,x,y,0,0,g) if (!gcc && !(gnc-gcc) && !(gcc-gpc) && !(gcn-gcc) && !(gcc-gcp)) cimg_mapV(img,k) {
+    cimg_map3x3(mask,x,y,0,0,g) if (!gcc && !(gnc-gcc) && !(gcc-gpc) && !(gcn-gcc) && !(gcc-gcp)) cimg_mapV(img,k) {
         cimg_get3x3(img,x,y,0,k,I);
         const float ix = 0.5f*(Inc-Ipc), iy = 0.5f*(Icn-Icp);
         G(x,y,0)+= ix*ix; G(x,y,1)+= ix*iy; G(x,y,2)+= iy*iy;
@@ -433,8 +433,8 @@ bool KisCImgFilter::prepare_resize()
     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);
-    tqmask = CImg<uchar>(img.width,img.height,1,1,255);
-    if (!anchor) tqmask.resize(w,h,1,1,1); else tqmask = ~tqmask.resize(w,h,1,1,4);
+    mask = CImg<uchar>(img.width,img.height,1,1,255);
+    if (!anchor) mask.resize(w,h,1,1,1); else mask = ~mask.resize(w,h,1,1,4);
     img0 = img.get_resize(w,h,1,-100,1);
     img.resize(w,h,1,-100,3);
     G = CImg<>(img.width,img.height,1,3);
@@ -618,7 +618,7 @@ void KisCImgFilter::compute_LIC(int &progressSteps)
                 return;
             }
 
-            if (!tqmask.data || tqmask(x,y)) compute_LIC_back_forward(x,y);
+            if (!mask.data || mask(x,y)) compute_LIC_back_forward(x,y);
         }
     }
 
@@ -680,9 +680,9 @@ bool KisCImgFilter::process()
         return true;
 }
 
-KisFilterConfigWidget * KisCImgFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/)
+KisFilterConfigWidget * KisCImgFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/)
 {
-    return new KisCImgconfigWidget(this, tqparent);
+    return new KisCImgconfigWidget(this, parent);
 }
 
 KisFilterConfiguration* KisCImgFilter::configuration(TQWidget* nwidget)
diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.h b/chalk/plugins/filters/cimg/kis_cimg_filter.h
index 3b7454761..965ecbd8b 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_filter.h
+++ b/chalk/plugins/filters/cimg/kis_cimg_filter.h
@@ -60,7 +60,7 @@ public:
     virtual bool supportsPreview() { return false; }
     virtual ColorSpaceIndependence colorSpaceIndependence();
 public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration * configuration(TQWidget*);
     virtual KisFilterConfiguration * configuration() { return new KisCImgFilterConfiguration();};
 private:
@@ -115,7 +115,7 @@ private:
         cimg_library::CImg<> dest, sum, W;
         cimg_library::CImg<> img, img0, flow,G;
         cimg_library::CImgl<> eigen;
-        cimg_library::CImg<unsigned char> tqmask;
+        cimg_library::CImg<unsigned char> mask;
 
 
 
diff --git a/chalk/plugins/filters/cimg/kis_cimg_plugin.cc b/chalk/plugins/filters/cimg/kis_cimg_plugin.cc
index 6c3e9522f..9ed82fe26 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_plugin.cc
+++ b/chalk/plugins/filters/cimg/kis_cimg_plugin.cc
@@ -28,12 +28,12 @@
 typedef KGenericFactory<KisCImgPlugin> KisCImgPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkcimg, KisCImgPluginFactory( "chalk" ) )
 
-KisCImgPlugin::KisCImgPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name)
+KisCImgPlugin::KisCImgPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name)
 {
     setInstance(KisCImgPluginFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisCImgFilter());
     }
 }
diff --git a/chalk/plugins/filters/cimg/kis_cimg_plugin.h b/chalk/plugins/filters/cimg/kis_cimg_plugin.h
index 2d35bff43..d016abf15 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_plugin.h
+++ b/chalk/plugins/filters/cimg/kis_cimg_plugin.h
@@ -25,7 +25,7 @@
 class KisCImgPlugin : public KParts::Plugin
 {
 public:
-    KisCImgPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisCImgPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisCImgPlugin();
 };
 
diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc
index c12ebf5f1..b65a435f9 100644
--- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc
+++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc
@@ -29,8 +29,8 @@
 #include "kis_cimgconfig_widget.h"
 #include "kis_cimg_filter.h"
 
-KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, TQWidget * tqparent, const char * name, WFlags f)
-    : KisFilterConfigWidget(tqparent, name, f)
+KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, TQWidget * parent, const char * name, WFlags f)
+    : KisFilterConfigWidget(parent, name, f)
 {
     m_page = new WdgCImg(this);
     Q_CHECK_PTR(m_page);
diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h
index aba373ca8..e95b34f0d 100644
--- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h
+++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h
@@ -34,7 +34,7 @@ class KisCImgconfigWidget : public KisFilterConfigWidget {
 
 public:
 
-    KisCImgconfigWidget(KisFilter* nfilter, TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 );
+    KisCImgconfigWidget(KisFilter* nfilter, TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
     virtual ~KisCImgconfigWidget() {};
 
 public:
diff --git a/chalk/plugins/filters/colorify/Colorify.cpp b/chalk/plugins/filters/colorify/Colorify.cpp
index 0b5010cfc..11f28d9a5 100644
--- a/chalk/plugins/filters/colorify/Colorify.cpp
+++ b/chalk/plugins/filters/colorify/Colorify.cpp
@@ -31,8 +31,8 @@
 typedef KGenericFactory<ChalkColorify> ChalkColorifyFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkcolorify, ChalkColorifyFactory( "chalk" ) )
 
-ChalkColorify::ChalkColorify(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkColorify::ChalkColorify(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkColorifyFactory::instance());
 
@@ -40,11 +40,11 @@ ChalkColorify::ChalkColorify(TQObject *tqparent, const char *name, const TQStrin
     kdDebug(41006) << "Colorify Filter plugin. Class: "
           << className()
           << ", Parent: "
-          << tqparent -> className()
+          << parent -> className()
           << "\n";
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisColorify());
     }
 }
@@ -59,9 +59,9 @@ KisColorify::KisColorify() : KisFilter(id(), "colors", i18n("&Colorify..."))
 {
 }
 
-KisFilterConfigWidget * KisColorify::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP )
+KisFilterConfigWidget * KisColorify::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP )
 {
-    return new KisWdgColorify(this, tqparent, "configuration of colorify");
+    return new KisWdgColorify(this, parent, "configuration of colorify");
 }
 
 KisFilterConfiguration* KisColorify::configuration(TQWidget* w)
diff --git a/chalk/plugins/filters/colorify/Colorify.h b/chalk/plugins/filters/colorify/Colorify.h
index 363785052..6a984134b 100644
--- a/chalk/plugins/filters/colorify/Colorify.h
+++ b/chalk/plugins/filters/colorify/Colorify.h
@@ -32,7 +32,7 @@
 class ChalkColorify : public KParts::Plugin
 {
 public:
-    ChalkColorify(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkColorify(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkColorify();
 };
 
@@ -49,7 +49,7 @@ class KisColorify : public KisFilter {
         virtual bool supportsAdjustmentLayers() { return false; }
         virtual ColorSpaceIndependence colorSpaceIndendendence() { return TO_LAB16; };
     public:
-        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
         virtual KisFilterConfiguration* configuration(TQWidget*);
 };
 
diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.cpp b/chalk/plugins/filters/colorify/KisWdgColorify.cpp
index 3d1e2413c..5b03ad70d 100644
--- a/chalk/plugins/filters/colorify/KisWdgColorify.cpp
+++ b/chalk/plugins/filters/colorify/KisWdgColorify.cpp
@@ -30,7 +30,7 @@
 
 #include "WdgColorifyBase.h"
 
-KisWdgColorify::KisWdgColorify( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name )
+KisWdgColorify::KisWdgColorify( KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name )
 {
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgColorifyBase(this);
diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.h b/chalk/plugins/filters/colorify/KisWdgColorify.h
index 662a24cd6..9e160fb78 100644
--- a/chalk/plugins/filters/colorify/KisWdgColorify.h
+++ b/chalk/plugins/filters/colorify/KisWdgColorify.h
@@ -35,7 +35,7 @@ class KisWdgColorify : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisWdgColorify( KisFilter* nfilter, TQWidget * tqparent, const char * name);
+        KisWdgColorify( KisFilter* nfilter, TQWidget * parent, const char * name);
         inline WdgColorifyBase* widget() { return m_widget; };
         virtual void setConfiguration(KisFilterConfiguration*);
     private:
diff --git a/chalk/plugins/filters/colors/colors.cc b/chalk/plugins/filters/colors/colors.cc
index d9a421348..d3cadc68a 100644
--- a/chalk/plugins/filters/colors/colors.cc
+++ b/chalk/plugins/filters/colors/colors.cc
@@ -28,8 +28,8 @@
 typedef KGenericFactory<ChalkExtensionsColors> ChalkExtensionsColorsFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkextensioncolorsfilters, ChalkExtensionsColorsFactory( "chalk" ) )
 
-ChalkExtensionsColors::ChalkExtensionsColors(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkExtensionsColors::ChalkExtensionsColors(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkExtensionsColorsFactory::instance());
 
@@ -37,11 +37,11 @@ ChalkExtensionsColors::ChalkExtensionsColors(TQObject *tqparent, const char *nam
     kdDebug(41006) << "Extensions Colors Filter plugin. Class: "
           << className()
           << ", Parent: "
-          << tqparent -> className()
+          << parent -> className()
           << "\n";
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisFilterMax());
         manager->add(new KisFilterMin());
         manager->add(new KisFilterColorToAlpha());
diff --git a/chalk/plugins/filters/colors/colors.h b/chalk/plugins/filters/colors/colors.h
index d93ae1cc6..dd27cc91b 100644
--- a/chalk/plugins/filters/colors/colors.h
+++ b/chalk/plugins/filters/colors/colors.h
@@ -30,7 +30,7 @@
 class ChalkExtensionsColors : public KParts::Plugin
 {
 public:
-    ChalkExtensionsColors(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkExtensionsColors(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkExtensionsColors();
 };
 
diff --git a/chalk/plugins/filters/colors/kis_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_color_to_alpha.cc
index 288149104..26f428448 100644
--- a/chalk/plugins/filters/colors/kis_color_to_alpha.cc
+++ b/chalk/plugins/filters/colors/kis_color_to_alpha.cc
@@ -34,9 +34,9 @@ KisFilterColorToAlpha::KisFilterColorToAlpha() : KisFilter(id(), "colors", i18n(
 {
 }
 
-KisFilterConfigWidget * KisFilterColorToAlpha::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP )
+KisFilterConfigWidget * KisFilterColorToAlpha::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP )
 {
-    return new KisWdgColorToAlpha(this, tqparent, "configuration of color to alpha");
+    return new KisWdgColorToAlpha(this, parent, "configuration of color to alpha");
 }
 
 KisFilterConfiguration* KisFilterColorToAlpha::configuration(TQWidget* w)
diff --git a/chalk/plugins/filters/colors/kis_color_to_alpha.h b/chalk/plugins/filters/colors/kis_color_to_alpha.h
index 9161b38e9..57f6ca7e1 100644
--- a/chalk/plugins/filters/colors/kis_color_to_alpha.h
+++ b/chalk/plugins/filters/colors/kis_color_to_alpha.h
@@ -39,7 +39,7 @@ class KisFilterColorToAlpha : public KisFilter {
         virtual bool supportsAdjustmentLayers() { return false; }
         virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; };
     public:
-        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
         virtual KisFilterConfiguration* configuration(TQWidget*);
 };
 
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 e70fbc856..31b726bf0 100644
--- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc
+++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc
@@ -30,7 +30,7 @@
 
 #include "wdgcolortoalphabase.h"
 
-KisWdgColorToAlpha::KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name )
+KisWdgColorToAlpha::KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name )
 {
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgColorToAlphaBase(this);
diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h
index d2b5c9b97..90d16ef2f 100644
--- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h
+++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h
@@ -35,7 +35,7 @@ class KisWdgColorToAlpha : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * tqparent, const char * name);
+        KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * parent, const char * name);
         inline WdgColorToAlphaBase* widget() { return m_widget; };
         virtual void setConfiguration(KisFilterConfiguration*);
     private:
diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cc b/chalk/plugins/filters/colorsfilters/colorsfilters.cc
index cdc7dedec..ae84bcaaa 100644
--- a/chalk/plugins/filters/colorsfilters/colorsfilters.cc
+++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cc
@@ -54,13 +54,13 @@
 typedef KGenericFactory<ColorsFilters> ColorsFiltersFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkcolorsfilters, ColorsFiltersFactory( "chalk" ) )
 
-ColorsFilters::ColorsFilters(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ColorsFilters::ColorsFilters(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ColorsFiltersFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisBrightnessContrastFilter());
         manager->add(new KisAutoContrast());
         manager->add(new KisPerChannelFilter());
diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.h b/chalk/plugins/filters/colorsfilters/colorsfilters.h
index ebf2dfebf..40dc8d747 100644
--- a/chalk/plugins/filters/colorsfilters/colorsfilters.h
+++ b/chalk/plugins/filters/colorsfilters/colorsfilters.h
@@ -29,7 +29,7 @@ class KisColorAdjustment;
 class ColorsFilters : public KParts::Plugin
 {
     public:
-        ColorsFilters(TQObject *tqparent, const char *name, const TQStringList &);
+        ColorsFilters(TQObject *parent, const char *name, const TQStringList &);
         virtual ~ColorsFilters();
 };
 
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
index e9280425c..a97f809bd 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
@@ -144,9 +144,9 @@ KisBrightnessContrastFilter::KisBrightnessContrastFilter()
 
 }
 
-KisFilterConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev)
+KisFilterConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(TQWidget *parent, KisPaintDeviceSP dev)
 {
-    return new KisBrightnessContrastConfigWidget(tqparent, dev);
+    return new KisBrightnessContrastConfigWidget(parent, dev);
 }
 
 KisFilterConfiguration* KisBrightnessContrastFilter::configuration(TQWidget *nwidget)
@@ -252,8 +252,8 @@ void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP
     setProgressDone();
 }
 
-KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f)
-    : KisFilterConfigWidget(tqparent, name, f)
+KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f)
+    : KisFilterConfigWidget(parent, name, f)
 {
     int i;
     int height;
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h
index 598e4bcc1..fb80a302a 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h
@@ -55,7 +55,7 @@ public:
 
 public:
 
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration * configuration(TQWidget *);
     virtual KisFilterConfiguration * configuration() { return new KisBrightnessContrastFilterConfiguration(); };
     virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&);
@@ -73,7 +73,7 @@ public:
 class KisBrightnessContrastConfigWidget : public KisFilterConfigWidget {
 
 public:
-    KisBrightnessContrastConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 );
+    KisBrightnessContrastConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 );
     virtual ~KisBrightnessContrastConfigWidget() {};
 
     KisBrightnessContrastFilterConfiguration * config();
diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
index 1eaa14170..928badedc 100644
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
@@ -154,9 +154,9 @@ TQString KisPerChannelFilterConfiguration::toString()
 }
 
 
-KisFilterConfigWidget * KisPerChannelFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev)
+KisFilterConfigWidget * KisPerChannelFilter::createConfigurationWidget(TQWidget *parent, KisPaintDeviceSP dev)
 {
-    return new KisPerChannelConfigWidget(tqparent, dev);
+    return new KisPerChannelConfigWidget(parent, dev);
 }
 
 KisFilterConfiguration* KisPerChannelFilter::configuration(TQWidget *nwidget)
@@ -300,8 +300,8 @@ void KisPerChannelConfigWidget::setActiveChannel(int ch)
     m_page->kCurve->setPixmap(pix);
 }
 
-KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f)
-    : KisFilterConfigWidget(tqparent, name, f)
+KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f)
+    : KisFilterConfigWidget(parent, name, f)
 {
     int i;
     int height;
diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h
index 6d11ab433..9497075af 100644
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h
@@ -59,7 +59,7 @@ class KisPerChannelFilter
 public:
     KisPerChannelFilter() : KisFilter( id(), "adjust", i18n("&Color Adjustment...")) {};
 public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration* configuration(TQWidget*);
     virtual KisFilterConfiguration* configuration() { return new KisPerChannelFilterConfiguration(0); };
     virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&);
@@ -80,7 +80,7 @@ class KisPerChannelConfigWidget : public KisFilterConfigWidget {
   TQ_OBJECT
 
 public:
-    KisPerChannelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 );
+    KisPerChannelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 );
     virtual ~KisPerChannelConfigWidget() {};
 
     KisPerChannelFilterConfiguration * config();
diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
index ddf2332f6..b3c73a924 100644
--- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
+++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
@@ -60,13 +60,13 @@ KisKernelSP createKernel( TQ_INT32 i0, TQ_INT32 i1, TQ_INT32 i2,
 typedef KGenericFactory<ChalkConvolutionFilters> ChalkConvolutionFiltersFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkconvolutionfilters, ChalkConvolutionFiltersFactory( "chalk" ) )
 
-ChalkConvolutionFilters::ChalkConvolutionFilters(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkConvolutionFilters::ChalkConvolutionFilters(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkConvolutionFiltersFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisGaussianBlurFilter());
         manager->add(new KisSharpenFilter());
         manager->add(new KisMeanRemovalFilter());
diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h
index 94e4654c3..aa8dc7491 100644
--- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h
+++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h
@@ -145,7 +145,7 @@ public:
 class ChalkConvolutionFilters : public KParts::Plugin
 {
 public:
-    ChalkConvolutionFilters(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkConvolutionFilters(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkConvolutionFilters();
 };
 
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc
index 8d48d25d2..39da5b188 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc
@@ -30,9 +30,9 @@
 #include "kis_matrix_widget.h"
 
 
-KisFilterConfigWidget * KisCustomConvolutionFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP)
+KisFilterConfigWidget * KisCustomConvolutionFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP)
 {
-    KisCustomConvolutionFilterConfigurationWidget* ccfcw = new KisCustomConvolutionFilterConfigurationWidget(this,tqparent, "custom convolution config widget");
+    KisCustomConvolutionFilterConfigurationWidget* ccfcw = new KisCustomConvolutionFilterConfigurationWidget(this,parent, "custom convolution config widget");
     Q_CHECK_PTR(ccfcw);
     return ccfcw;
 }
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h
index cbfd375e3..60c009ce3 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h
@@ -39,7 +39,7 @@ public:
     virtual bool supportsIncrementalPainting() { return true; }
 
 public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration * configuration(TQWidget*);
     virtual KisFilterConfiguration * configuration() { return configuration(0); }; 
 protected:
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 b1905d300..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
@@ -34,8 +34,8 @@
 #include "kis_custom_convolution_filter_configuration_base_widget.h"
 #include "kis_matrix_widget.h"
 
-KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigurationWidget( KisFilter* /*nfilter*/, TQWidget * tqparent, const char * name)
-    : KisFilterConfigWidget ( tqparent, name )
+KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigurationWidget( KisFilter* /*nfilter*/, TQWidget * parent, const char * name)
+    : KisFilterConfigWidget ( parent, name )
 {
     TQGridLayout *widgetLayout = new TQGridLayout(this, 2, 1);
     Q_CHECK_PTR(widgetLayout);
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h
index b5819e394..eb16e587a 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h
@@ -34,7 +34,7 @@ class KisCustomConvolutionFilterConfigurationWidget : public KisFilterConfigWidg
 
 public:
 
-    KisCustomConvolutionFilterConfigurationWidget( KisFilter* nfilter, TQWidget * tqparent, const char * name);
+    KisCustomConvolutionFilterConfigurationWidget( KisFilter* nfilter, TQWidget * parent, const char * name);
     inline KisCustomConvolutionFilterConfigurationBaseWidget* matrixWidget() { return m_ccfcws; };
     void setConfiguration(KisFilterConfiguration * config);
 
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc
index 1cd1aa8df..68f560c41 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc
@@ -433,12 +433,12 @@ void KisCubismFilter::cubism(KisPaintDeviceSP src, KisPaintDeviceSP dst, const T
         setProgressDone();
 }
 
-KisFilterConfigWidget * KisCubismFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/)
+KisFilterConfigWidget * KisCubismFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/)
 {
     vKisIntegerWidgetParam param;
     param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Tile size"), "tileSize" ) );
     param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Tile saturation"), "tileSaturation" ) );
-    return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
 }
 
 KisFilterConfiguration* KisCubismFilter::configuration(TQWidget* nwidget)
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h
index f2624030c..332e5fd12 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h
@@ -60,7 +60,7 @@ public:
     virtual bool workWith(KisColorSpace* cs);
     virtual ColorSpaceIndependence colorSpaceIndependence() { return TO_RGBA8; };
 public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration* configuration(TQWidget*);
     virtual KisFilterConfiguration* configuration() { return new KisCubismFilterConfiguration( 10, 10); };
 private:
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc
index 4e7dfa7d8..7215a2e3b 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc
@@ -25,13 +25,13 @@
 typedef KGenericFactory<KisCubismFilterPlugin> KisCubismFilterPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkcubismfilter, KisCubismFilterPluginFactory( "chalk" ) )
 
-KisCubismFilterPlugin::KisCubismFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name)
+KisCubismFilterPlugin::KisCubismFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name)
 {
     setInstance(KisCubismFilterPluginFactory::instance());
 
-    if ( tqparent->inherits("KisFilterRegistry") )
+    if ( parent->inherits("KisFilterRegistry") )
     {
-        KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent);
+        KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent);
         r->add(new KisCubismFilter());
     }
 }
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h
index b37e40c1f..064c55e3c 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h
@@ -25,7 +25,7 @@
 class KisCubismFilterPlugin : public KParts::Plugin
 {
 public:
-    KisCubismFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisCubismFilterPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisCubismFilterPlugin();
 };
 
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc
index f15b5952f..6e69761b6 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc
@@ -158,11 +158,11 @@ int KisEmbossFilter::Lim_Max (int Now, int Up, int Max)
     return (Up);
 }
 
-KisFilterConfigWidget * KisEmbossFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP)
+KisFilterConfigWidget * KisEmbossFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP)
 {
     vKisIntegerWidgetParam param;
     param.push_back( KisIntegerWidgetParam( 10, 300, 30, i18n("Depth"), "depth" ) );
-    KisFilterConfigWidget * w = new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    KisFilterConfigWidget * w = new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
     Q_CHECK_PTR(w);
     return w;
 }
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.h b/chalk/plugins/filters/embossfilter/kis_emboss_filter.h
index fe4410ed5..1e46d21f1 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.h
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.h
@@ -50,7 +50,7 @@ public:
     virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP )
     { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisEmbossFilterConfiguration(100)); return list; }
     public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration* configuration(TQWidget*);
     virtual KisFilterConfiguration* configuration() {return new KisEmbossFilterConfiguration( 30 );};
 
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc
index 4aec1db6a..bd11b115b 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc
@@ -25,12 +25,12 @@
 typedef KGenericFactory<KisEmbossFilterPlugin> KisEmbossFilterPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkembossfilter, KisEmbossFilterPluginFactory( "chalk" ) )
 
-KisEmbossFilterPlugin::KisEmbossFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name)
+KisEmbossFilterPlugin::KisEmbossFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name)
 {
     setInstance(KisEmbossFilterPluginFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisEmbossFilter());
     }
 }
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h
index 39803418f..81312b014 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h
@@ -24,7 +24,7 @@
 class KisEmbossFilterPlugin : public KParts::Plugin
 {
 public:
-    KisEmbossFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisEmbossFilterPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisEmbossFilterPlugin();
 };
 
diff --git a/chalk/plugins/filters/example/example.cc b/chalk/plugins/filters/example/example.cc
index 2e2fbc7c7..e1e33ade7 100644
--- a/chalk/plugins/filters/example/example.cc
+++ b/chalk/plugins/filters/example/example.cc
@@ -44,14 +44,14 @@
 typedef KGenericFactory<ChalkExample> ChalkExampleFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkexample, ChalkExampleFactory( "chalk" ) )
 
-ChalkExample::ChalkExample(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkExample::ChalkExample(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkExampleFactory::instance());
 
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisFilterInvert());
     }
 }
diff --git a/chalk/plugins/filters/example/example.h b/chalk/plugins/filters/example/example.h
index df49d0366..4df6705c7 100644
--- a/chalk/plugins/filters/example/example.h
+++ b/chalk/plugins/filters/example/example.h
@@ -27,7 +27,7 @@
 class ChalkExample : public KParts::Plugin
 {
 public:
-    ChalkExample(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkExample(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkExample();
 };
 
diff --git a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc
index 10ef044d9..c43e56900 100644
--- a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc
+++ b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc
@@ -37,19 +37,19 @@ typedef KGenericFactory<FastColorTransferPlugin> ChalkFastColorTransferFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkfastcolortransfer, ChalkFastColorTransferFactory( "chalk" ) )
 
 
-FastColorTransferPlugin::FastColorTransferPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+FastColorTransferPlugin::FastColorTransferPlugin(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkFastColorTransferFactory::instance());
 
     kdDebug(41006) << "Color Transfer Filter plugin. Class: "
           << className()
           << ", Parent: "
-          << tqparent -> className()
+          << parent -> className()
           << "\n";
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisFilterFastColorTransfer());
     }
 }
@@ -63,9 +63,9 @@ KisFilterFastColorTransfer::KisFilterFastColorTransfer() : KisFilter(id(), "colo
 }
 
 
-KisFilterConfigWidget * KisFilterFastColorTransfer::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP )
+KisFilterConfigWidget * KisFilterFastColorTransfer::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP )
 {
-    return new KisWdgFastColorTransfer(this, tqparent, "configuration of color to alpha");
+    return new KisWdgFastColorTransfer(this, parent, "configuration of color to alpha");
 }
 
 KisFilterConfiguration* KisFilterFastColorTransfer::configuration(TQWidget* w)
diff --git a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h
index d8a3c8983..dbaee9f8d 100644
--- a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h
+++ b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h
@@ -31,7 +31,7 @@
 class FastColorTransferPlugin : public KParts::Plugin
 {
     public:
-        FastColorTransferPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+        FastColorTransferPlugin(TQObject *parent, const char *name, const TQStringList &);
         virtual ~FastColorTransferPlugin();
 };
 
@@ -48,7 +48,7 @@ class KisFilterFastColorTransfer : public KisFilter
         virtual bool supportsIncrementalPainting() { return false; }
         virtual bool supportsAdjustmentLayers() { return false; }
     public:
-        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
         virtual KisFilterConfiguration* configuration(TQWidget*);
 };
 
diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
index 3c08cac31..49826ccb9 100644
--- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
+++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
@@ -26,7 +26,7 @@
 
 #include "wdgfastcolortransfer.h"
 
-KisWdgFastColorTransfer::KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name )
+KisWdgFastColorTransfer::KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name )
 {
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgFastColorTransfer(this);
diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h
index 0a29aef51..0e95e3194 100644
--- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h
+++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h
@@ -36,7 +36,7 @@ class WdgFastColorTransfer;
 class KisWdgFastColorTransfer : public KisFilterConfigWidget
 {
     public:
-        KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * tqparent, const char * name);
+        KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * parent, const char * name);
         ~KisWdgFastColorTransfer();
         virtual void setConfiguration(KisFilterConfiguration*);
         inline WdgFastColorTransfer* widget() { return m_widget; }
diff --git a/chalk/plugins/filters/halftone/kis_halftone.cpp b/chalk/plugins/filters/halftone/kis_halftone.cpp
index 35e838ed2..c2c2f4631 100644
--- a/chalk/plugins/filters/halftone/kis_halftone.cpp
+++ b/chalk/plugins/filters/halftone/kis_halftone.cpp
@@ -36,21 +36,21 @@
     typedef KGenericFactory<ChalkHalftone> ChalkHalftoneFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkhalftone, ChalkHalftoneFactory( "chalk" ) )
 
-        ChalkHalftone::ChalkHalftone(TQObject *tqparent, const char *name, const TQStringList &)
-  : KParts::Plugin(tqparent, name)
+        ChalkHalftone::ChalkHalftone(TQObject *parent, const char *name, const TQStringList &)
+  : KParts::Plugin(parent, name)
 {
     setInstance(ChalkHalftoneFactory::instance());
 
     kdDebug(41006) << "Halftone filter plugin. Class: "
            << className()
            << ", Parent: "
-           << tqparent->className()
+           << parent->className()
            << "\n";
 
 
-    if ( tqparent->inherits("KisFilterRegistry") )
+    if ( parent->inherits("KisFilterRegistry") )
     {
-        KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent);
+        KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent);
         r->add(new KisHalftoneReduction());
     }
 }
@@ -71,12 +71,12 @@ KisHalftoneReduction::~KisHalftoneReduction()
 {
 }
 
-KisFilterConfigWidget * KisHalftoneReduction::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP )
+KisFilterConfigWidget * KisHalftoneReduction::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP )
 {
     vKisIntegerWidgetParam param;
     param.push_back( KisIntegerWidgetParam( 0, 100, BEST_WAVELET_FREQUENCY_VALUE, i18n("Frequency"), "frequency" ) );
     param.push_back( KisIntegerWidgetParam( 0, 100, 2, i18n("Half-size"), "halfsize" ) );
-    return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
 }
 
 KisFilterConfiguration* KisHalftoneReduction::configuration(TQWidget* nwidget )
@@ -121,11 +121,11 @@ void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, K
     kdDebug(41005) << halfSize << endl;
     KisAutobrushShape* kas = new KisAutobrushCircleShape(2*halfSize+1, 2*halfSize+1 , halfSize, halfSize);
     
-    TQImage tqmask;
-    kas->createBrush(&tqmask);
+    TQImage mask;
+    kas->createBrush(&mask);
     
-    KisKernelSP kernel = KisKernel::fromTQImage(tqmask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage
-    tqmask.save("testtqmask.png", "PNG");
+    KisKernelSP kernel = KisKernel::fromTQImage(mask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage
+    mask.save("testmask.png", "PNG");
     
     KisPaintDeviceSP interm = new KisPaintDevice(*src);
     KisColorSpace * cs = src->colorSpace();
diff --git a/chalk/plugins/filters/halftone/kis_halftone.h b/chalk/plugins/filters/halftone/kis_halftone.h
index 38842d311..96f22e8f0 100644
--- a/chalk/plugins/filters/halftone/kis_halftone.h
+++ b/chalk/plugins/filters/halftone/kis_halftone.h
@@ -32,7 +32,7 @@
 class ChalkHalftone : public KParts::Plugin
 {
   public:
-        ChalkHalftone(TQObject *tqparent, const char *name, const TQStringList &);
+        ChalkHalftone(TQObject *parent, const char *name, const TQStringList &);
         virtual ~ChalkHalftone();
 };
 
@@ -65,7 +65,7 @@ public:
     virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&);
     virtual KisFilterConfiguration * configuration(TQWidget* nwidget);
     virtual KisFilterConfiguration * configuration() {return new KisHalftoneReductionConfiguration( BEST_WAVELET_FREQUENCY_VALUE, 2 );};
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
 
     static inline KisID id() { return KisID("halftone", i18n("Halftone Reducer")); };
     virtual bool supportsPainting() { return false; }
diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
index 8108a3d6b..78398157f 100644
--- a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
+++ b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
@@ -47,21 +47,21 @@
 typedef KGenericFactory<ChalkImageEnhancement> ChalkImageEnhancementFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkimageenhancement, ChalkImageEnhancementFactory( "chalk" ) )
 
-        ChalkImageEnhancement::ChalkImageEnhancement(TQObject *tqparent, const char *name, const TQStringList &)
-  : KParts::Plugin(tqparent, name)
+        ChalkImageEnhancement::ChalkImageEnhancement(TQObject *parent, const char *name, const TQStringList &)
+  : KParts::Plugin(parent, name)
 {
     setInstance(ChalkImageEnhancementFactory::instance());
 
     kdDebug(41006) << "Image enhancement filter plugin. Class: "
            << className()
            << ", Parent: "
-           << tqparent->className()
+           << parent->className()
            << "\n";
 
 
-    if ( tqparent->inherits("KisFilterRegistry") )
+    if ( parent->inherits("KisFilterRegistry") )
     {
-        KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent);
+        KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent);
         r->add(new KisSimpleNoiseReducer());
         r->add(new KisWaveletNoiseReduction());
     }
diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.h b/chalk/plugins/filters/imageenhancement/imageenhancement.h
index b333e25ff..7a00f3526 100644
--- a/chalk/plugins/filters/imageenhancement/imageenhancement.h
+++ b/chalk/plugins/filters/imageenhancement/imageenhancement.h
@@ -27,7 +27,7 @@
 class ChalkImageEnhancement : public KParts::Plugin
 {
   public:
-        ChalkImageEnhancement(TQObject *tqparent, const char *name, const TQStringList &);
+        ChalkImageEnhancement(TQObject *parent, const char *name, const TQStringList &);
         virtual ~ChalkImageEnhancement();
 };
 
diff --git a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp
index 0ff7a9586..f38f364ce 100644
--- a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp
+++ b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp
@@ -37,12 +37,12 @@ KisSimpleNoiseReducer::~KisSimpleNoiseReducer()
 {
 }
 
-KisFilterConfigWidget * KisSimpleNoiseReducer::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP)
+KisFilterConfigWidget * KisSimpleNoiseReducer::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP)
 {
     vKisIntegerWidgetParam param;
     param.push_back( KisIntegerWidgetParam( 0, 255, 50, i18n("Threshold"), "threshold" ) );
     param.push_back( KisIntegerWidgetParam( 0, 10, 1, i18n("Window size"), "windowsize") );
-    return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
 }
 
 KisFilterConfiguration* KisSimpleNoiseReducer::configuration(TQWidget* nwidget)
@@ -77,13 +77,13 @@ void KisSimpleNoiseReducer::process(KisPaintDeviceSP src, KisPaintDeviceSP dst,
 
     KisColorSpace* cs = src->colorSpace();
 
-    // Compute the blur tqmask
+    // Compute the blur mask
     KisAutobrushShape* kas = new KisAutobrushCircleShape(2*windowsize+1, 2*windowsize+1, windowsize, windowsize);
 
-    TQImage tqmask;
-    kas->createBrush(&tqmask);
+    TQImage mask;
+    kas->createBrush(&mask);
 
-    KisKernelSP kernel = KisKernel::fromTQImage(tqmask);
+    KisKernelSP kernel = KisKernel::fromTQImage(mask);
 
     KisPaintDeviceSP interm = new KisPaintDevice(*src);
     KisConvolutionPainter painter( interm );
diff --git a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h
index a233bb854..620981c73 100644
--- a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h
+++ b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h
@@ -47,7 +47,7 @@ class KisSimpleNoiseReducer : public KisFilter
         virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&);
         virtual KisFilterConfiguration * configuration(TQWidget* nwidget);
         virtual KisFilterConfiguration * configuration() { return new KisSimpleNoiseReducerConfiguration( 50, 1); };
-        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
 
         static inline KisID id() { return KisID("gaussiannoisereducer", i18n("Gaussian Noise Reducer")); };
         virtual bool supportsPainting() { return false; }
diff --git a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
index 021bf5c69..e5cca62ed 100644
--- a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
+++ b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
@@ -38,11 +38,11 @@ KisWaveletNoiseReduction::~KisWaveletNoiseReduction()
 {
 }
 
-KisFilterConfigWidget * KisWaveletNoiseReduction::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP )
+KisFilterConfigWidget * KisWaveletNoiseReduction::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP )
 {
     vKisDoubleWidgetParam param;
     param.push_back( KisDoubleWidgetParam( 0.0, 256.0, BEST_WAVELET_THRESHOLD_VALUE, i18n("Threshold"), "threshold" ) );
-    return new KisMultiDoubleFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    return new KisMultiDoubleFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
 }
 
 KisFilterConfiguration* KisWaveletNoiseReduction::configuration(TQWidget* nwidget )
diff --git a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h
index 85a96ec81..b6da5773f 100644
--- a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h
+++ b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h
@@ -54,7 +54,7 @@ public:
     virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&);
     virtual KisFilterConfiguration * configuration(TQWidget* nwidget);
     virtual KisFilterConfiguration * configuration() {return new KisWaveletNoiseReductionConfiguration( BEST_WAVELET_THRESHOLD_VALUE );};
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
 
     static inline KisID id() { return KisID("waveletnoisereducer", i18n("Wavelet Noise Reducer")); };
     virtual bool supportsPainting() { return false; }
diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
index f33681a57..b83baa116 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
+++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
@@ -26,8 +26,8 @@
 
 #include "wdglenscorrectionoptions.h"
 
-KisWdgLensCorrection::KisWdgLensCorrection(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name)
-    : KisFilterConfigWidget(tqparent,name)
+KisWdgLensCorrection::KisWdgLensCorrection(KisFilter* /*nfilter*/, TQWidget* parent, const char* name)
+    : KisFilterConfigWidget(parent,name)
 {
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgLensCorrectionOptions(this);
diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h
index 193aa5aac..d5d3ce96a 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h
+++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h
@@ -31,7 +31,7 @@ class KisWdgLensCorrection : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisWdgLensCorrection(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0);
+        KisWdgLensCorrection(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0);
         ~KisWdgLensCorrection();
     public:
         inline WdgLensCorrectionOptions* widget() { return m_widget; };
diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc
index cd3627c5a..4fefb5970 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc
+++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc
@@ -52,14 +52,14 @@
 typedef KGenericFactory<ChalkLensCorrectionFilter> ChalkLensCorrectionFilterFactory;
 K_EXPORT_COMPONENT_FACTORY( chalklenscorrectionfilter, ChalkLensCorrectionFilterFactory( "chalk" ) )
 
-ChalkLensCorrectionFilter::ChalkLensCorrectionFilter(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkLensCorrectionFilter::ChalkLensCorrectionFilter(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkLensCorrectionFilterFactory::instance());
 
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisFilterLensCorrection());
     }
 }
@@ -88,9 +88,9 @@ KisFilterConfiguration* KisFilterLensCorrection::configuration(TQWidget* w)
     return config;
 }
 
-KisFilterConfigWidget * KisFilterLensCorrection::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/)
+KisFilterConfigWidget * KisFilterLensCorrection::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/)
 {
-    return new KisWdgLensCorrection((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of lens correction filter").ascii());
+    return new KisWdgLensCorrection((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of lens correction filter").ascii());
 }
 
 void KisFilterLensCorrection::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rawrect)
diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h
index f04012b6a..a54f11a99 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h
+++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h
@@ -29,7 +29,7 @@ class KisFilterConfigWidget;
 class ChalkLensCorrectionFilter : public KParts::Plugin
 {
 public:
-    ChalkLensCorrectionFilter(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkLensCorrectionFilter(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkLensCorrectionFilter();
 };
 
@@ -46,7 +46,7 @@ class KisFilterLensCorrection : public KisFilter
         virtual bool supportsIncrementalPainting() { return false; }
         virtual bool supportsAdjustmentLayers() { return false; }
     public:
-        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
         virtual KisFilterConfiguration* configuration(TQWidget*);
 };
 
diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cc
index 948fd277c..7b836436e 100644
--- a/chalk/plugins/filters/levelfilter/kgradientslider.cc
+++ b/chalk/plugins/filters/levelfilter/kgradientslider.cc
@@ -34,8 +34,8 @@
 
 #include "kgradientslider.h"
 
-KGradientSlider::KGradientSlider(TQWidget *tqparent, const char *name, WFlags f)
-            : TQWidget(tqparent, name, f)
+KGradientSlider::KGradientSlider(TQWidget *parent, const char *name, WFlags f)
+            : TQWidget(parent, name, f)
 {
     m_dragging = false;
     
diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.h b/chalk/plugins/filters/levelfilter/kgradientslider.h
index c8990c805..ad667ca27 100644
--- a/chalk/plugins/filters/levelfilter/kgradientslider.h
+++ b/chalk/plugins/filters/levelfilter/kgradientslider.h
@@ -40,7 +40,7 @@ Q_OBJECT
     } eCursor;
 
 public:
-    KGradientSlider(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0);
+    KGradientSlider(TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
 
     virtual ~KGradientSlider();
 
diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cc
index fb437f269..b7c1cb00d 100644
--- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc
+++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cc
@@ -86,9 +86,9 @@ KisLevelFilter::KisLevelFilter()
 
 }
 
-KisFilterConfigWidget * KisLevelFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev)
+KisFilterConfigWidget * KisLevelFilter::createConfigurationWidget(TQWidget *parent, KisPaintDeviceSP dev)
 {
-    return new KisLevelConfigWidget(tqparent, dev);
+    return new KisLevelConfigWidget(parent, dev);
 }
 
 KisFilterConfiguration* KisLevelFilter::configuration(TQWidget *nwidget)
@@ -207,8 +207,8 @@ void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt
     setProgressDone();
 }
 
-KisLevelConfigWidget::KisLevelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f)
-    : KisFilterConfigWidget(tqparent, name, f)
+KisLevelConfigWidget::KisLevelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f)
+    : KisFilterConfigWidget(parent, name, f)
 {
     m_page = new WdgLevel(this);
     histogram = NULL;
diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.h b/chalk/plugins/filters/levelfilter/kis_level_filter.h
index 8f3d3591b..b2a385215 100644
--- a/chalk/plugins/filters/levelfilter/kis_level_filter.h
+++ b/chalk/plugins/filters/levelfilter/kis_level_filter.h
@@ -57,7 +57,7 @@ public:
 
 public:
 
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration * configuration(TQWidget *);
     virtual KisFilterConfiguration * configuration() { return new KisLevelFilterConfiguration(); };
     virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&);
@@ -76,7 +76,7 @@ class KisLevelConfigWidget : public KisFilterConfigWidget {
 Q_OBJECT
   TQ_OBJECT
 public:
-    KisLevelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 );
+    KisLevelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 );
     virtual ~KisLevelConfigWidget();
 
     KisLevelFilterConfiguration * config();
diff --git a/chalk/plugins/filters/levelfilter/levelfilter.cc b/chalk/plugins/filters/levelfilter/levelfilter.cc
index 669775fbc..cabda0b5b 100644
--- a/chalk/plugins/filters/levelfilter/levelfilter.cc
+++ b/chalk/plugins/filters/levelfilter/levelfilter.cc
@@ -51,13 +51,13 @@
 typedef KGenericFactory<LevelFilter> LevelFilterFactory;
 K_EXPORT_COMPONENT_FACTORY( chalklevelfilter, LevelFilterFactory( "chalk" ) )
 
-LevelFilter::LevelFilter(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+LevelFilter::LevelFilter(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(LevelFilterFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisLevelFilter());
     }
 }
diff --git a/chalk/plugins/filters/levelfilter/levelfilter.h b/chalk/plugins/filters/levelfilter/levelfilter.h
index 69627ff7f..433a8d8ac 100644
--- a/chalk/plugins/filters/levelfilter/levelfilter.h
+++ b/chalk/plugins/filters/levelfilter/levelfilter.h
@@ -28,7 +28,7 @@ class KisColorAdjustment;
 class LevelFilter : public KParts::Plugin
 {
     public:
-        LevelFilter(TQObject *tqparent, const char *name, const TQStringList &);
+        LevelFilter(TQObject *parent, const char *name, const TQStringList &);
         virtual ~LevelFilter();
 };
 
diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
index 060418f3a..c13db9527 100644
--- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
+++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
@@ -26,8 +26,8 @@
 
 #include "wdgnoiseoptions.h"
 
-KisWdgNoise::KisWdgNoise(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name)
-    : KisFilterConfigWidget(tqparent,name)
+KisWdgNoise::KisWdgNoise(KisFilter* /*nfilter*/, TQWidget* parent, const char* name)
+    : KisFilterConfigWidget(parent,name)
 {
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgNoiseOptions(this);
diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.h b/chalk/plugins/filters/noisefilter/kis_wdg_noise.h
index ca42ebd23..a9b347459 100644
--- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.h
+++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.h
@@ -31,7 +31,7 @@ class KisWdgNoise : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisWdgNoise(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0);
+        KisWdgNoise(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0);
         ~KisWdgNoise();
     public:
         inline WdgNoiseOptions* widget() { return m_widget; };
diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cc b/chalk/plugins/filters/noisefilter/noisefilter.cc
index af593703b..0f634eb89 100644
--- a/chalk/plugins/filters/noisefilter/noisefilter.cc
+++ b/chalk/plugins/filters/noisefilter/noisefilter.cc
@@ -48,14 +48,14 @@
 typedef KGenericFactory<ChalkNoiseFilter> ChalkNoiseFilterFactory;
 K_EXPORT_COMPONENT_FACTORY( chalknoisefilter, ChalkNoiseFilterFactory( "chalk" ) )
 
-ChalkNoiseFilter::ChalkNoiseFilter(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkNoiseFilter::ChalkNoiseFilter(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkNoiseFilterFactory::instance());
 
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisFilterNoise());
     }
 }
@@ -80,9 +80,9 @@ KisFilterConfiguration* KisFilterNoise::configuration(TQWidget* w)
     return config;
 }
 
-KisFilterConfigWidget * KisFilterNoise::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev)
+KisFilterConfigWidget * KisFilterNoise::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev)
 {
-    return new KisWdgNoise((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of noise filter").ascii());
+    return new KisWdgNoise((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of noise filter").ascii());
 }
 
 void KisFilterNoise::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect)
diff --git a/chalk/plugins/filters/noisefilter/noisefilter.h b/chalk/plugins/filters/noisefilter/noisefilter.h
index b73c761f4..c630e71fb 100644
--- a/chalk/plugins/filters/noisefilter/noisefilter.h
+++ b/chalk/plugins/filters/noisefilter/noisefilter.h
@@ -29,7 +29,7 @@ class KisFilterConfigWidget;
 class ChalkNoiseFilter : public KParts::Plugin
 {
 public:
-    ChalkNoiseFilter(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkNoiseFilter(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkNoiseFilter();
 };
 
@@ -45,7 +45,7 @@ class KisFilterNoise : public KisFilter
         virtual bool supportsPreview() { return true; }
         virtual bool supportsIncrementalPainting() { return false; }
     public:
-        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
         virtual KisFilterConfiguration* configuration(TQWidget*);
 };
 
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
index a658b863b..2909e8a16 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
@@ -228,12 +228,12 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const TQRect& b
 }
 
 
-KisFilterConfigWidget * KisOilPaintFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/)
+KisFilterConfigWidget * KisOilPaintFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/)
 {
     vKisIntegerWidgetParam param;
     param.push_back( KisIntegerWidgetParam( 1, 5, 1, i18n("Brush size"), "brushSize" ) );
     param.push_back( KisIntegerWidgetParam( 10, 255, 30, i18n("Smooth"), "smooth" ) );
-    return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
 }
 
 KisFilterConfiguration* KisOilPaintFilter::configuration(TQWidget* nwidget)
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h
index fbc07a635..912f8b45b 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h
@@ -55,7 +55,7 @@ public:
     virtual bool supportsAdjustmentLayers() { return false; }
     virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP dev);
     public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration * configuration(TQWidget*);
     virtual KisFilterConfiguration * configuration() { return new KisOilPaintFilterConfiguration( 1, 30); };
 private:
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc
index 7167b04d4..d9c9f3e6f 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc
@@ -26,12 +26,12 @@
 typedef KGenericFactory<KisOilPaintFilterPlugin> KisOilPaintFilterPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkoilpaintfilter, KisOilPaintFilterPluginFactory( "chalk" ) )
 
-KisOilPaintFilterPlugin::KisOilPaintFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name)
+KisOilPaintFilterPlugin::KisOilPaintFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name)
 {
     setInstance(KisOilPaintFilterPluginFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisOilPaintFilter());
     }
 
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h
index 1f780918a..2900f59f1 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h
@@ -25,7 +25,7 @@
 class KisOilPaintFilterPlugin : public KParts::Plugin
 {
 public:
-    KisOilPaintFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisOilPaintFilterPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisOilPaintFilterPlugin();
 };
 
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc
index 267b159b5..33886f2c1 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc
@@ -163,12 +163,12 @@ void KisPixelizeFilter::pixelize(KisPaintDeviceSP src, KisPaintDeviceSP dst, int
     setProgressDone();
 }
 
-KisFilterConfigWidget * KisPixelizeFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/)
+KisFilterConfigWidget * KisPixelizeFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/)
 {
     vKisIntegerWidgetParam param;
     param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Pixel width"), "pixelWidth" ) );
     param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Pixel height"), "pixelHeight" ) );
-    return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
 }
 
 KisFilterConfiguration* KisPixelizeFilter::configuration(TQWidget* nwidget)
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h
index c7d8bb316..306921e81 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h
@@ -51,7 +51,7 @@ public:
     virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP )
         { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisPixelizeFilterConfiguration(10,10)); return list; }
 public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration* configuration(TQWidget*);
     virtual KisFilterConfiguration * configuration();
 private:
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc
index 93309146f..d93cad4e1 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc
@@ -26,13 +26,13 @@
 typedef KGenericFactory<KisPixelizeFilterPlugin> KisPixelizeFilterPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkpixelizefilter, KisPixelizeFilterPluginFactory( "chalk" ) )
 
-KisPixelizeFilterPlugin::KisPixelizeFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+KisPixelizeFilterPlugin::KisPixelizeFilterPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(KisPixelizeFilterPluginFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisPixelizeFilter());
     }
 }
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h
index 25d8a62f6..f662cf9d4 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h
@@ -25,7 +25,7 @@
 class KisPixelizeFilterPlugin : public KParts::Plugin
 {
 public:
-    KisPixelizeFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisPixelizeFilterPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisPixelizeFilterPlugin();
 };
 
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
index c208bb52a..81ee1448f 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
@@ -418,13 +418,13 @@ uchar KisRainDropsFilter::LimitValues (int ColorValue)
     return ((uchar) ColorValue);
 }
 
-KisFilterConfigWidget * KisRainDropsFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP)
+KisFilterConfigWidget * KisRainDropsFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP)
 {
     vKisIntegerWidgetParam param;
     param.push_back( KisIntegerWidgetParam( 1, 200, 80, i18n("Drop size"), "dropsize" ) );
     param.push_back( KisIntegerWidgetParam( 1, 500, 80, i18n("Number"), "number" ) );
     param.push_back( KisIntegerWidgetParam( 1, 100, 30, i18n("Fish eyes"), "fishEyes" ) );
-    return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
 }
 
 KisFilterConfiguration* KisRainDropsFilter::configuration(TQWidget* nwidget)
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h
index 0d797d7d3..91a2963c7 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h
@@ -55,7 +55,7 @@ public:
     { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisRainDropsFilterConfiguration( 30, 80, 20)); return list; }
 
 public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration* configuration(TQWidget*);
 private:
     void   rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, int DropSize, int Amount, int Coeff);
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc
index 593311d50..f62196cb9 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc
@@ -29,12 +29,12 @@
 typedef KGenericFactory<KisRainDropsFilterPlugin> KisRainDropsFilterPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkraindropsfilter, KisRainDropsFilterPluginFactory( "chalk" ) )
 
-KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name)
+KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name)
 {
     setInstance(KisRainDropsFilterPluginFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisRainDropsFilter());
     }
 }
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h
index ca4e05d37..edbf33bff 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h
@@ -26,7 +26,7 @@
 class KisRainDropsFilterPlugin : public KParts::Plugin
 {
 public:
-    KisRainDropsFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisRainDropsFilterPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisRainDropsFilterPlugin();
 };
 
diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
index 044f9613b..ba157e14d 100644
--- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
+++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
@@ -26,8 +26,8 @@
 
 #include "wdgrandompickoptions.h"
 
-KisWdgRandomPick::KisWdgRandomPick(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name)
-    : KisFilterConfigWidget(tqparent,name)
+KisWdgRandomPick::KisWdgRandomPick(KisFilter* /*nfilter*/, TQWidget* parent, const char* name)
+    : KisFilterConfigWidget(parent,name)
 {
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgRandomPickOptions(this);
diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h
index 54b46e204..761715307 100644
--- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h
+++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h
@@ -31,7 +31,7 @@ class KisWdgRandomPick : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisWdgRandomPick(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0);
+        KisWdgRandomPick(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0);
         ~KisWdgRandomPick();
     public:
         inline WdgRandomPickOptions* widget() { return m_widget; };
diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cc b/chalk/plugins/filters/randompickfilter/randompickfilter.cc
index 3a645590c..54af3e7bd 100644
--- a/chalk/plugins/filters/randompickfilter/randompickfilter.cc
+++ b/chalk/plugins/filters/randompickfilter/randompickfilter.cc
@@ -49,14 +49,14 @@
 typedef KGenericFactory<ChalkRandomPickFilter> ChalkRandomPickFilterFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkrandompickfilter, ChalkRandomPickFilterFactory( "chalk" ) )
 
-ChalkRandomPickFilter::ChalkRandomPickFilter(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkRandomPickFilter::ChalkRandomPickFilter(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkRandomPickFilterFactory::instance());
 
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisFilterRandomPick());
     }
 }
@@ -82,9 +82,9 @@ KisFilterConfiguration* KisFilterRandomPick::configuration(TQWidget* w)
     return config;
 }
 
-KisFilterConfigWidget * KisFilterRandomPick::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev)
+KisFilterConfigWidget * KisFilterRandomPick::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev)
 {
-    return new KisWdgRandomPick((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of random pick filter").ascii());
+    return new KisWdgRandomPick((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of random pick filter").ascii());
 }
 
 void KisFilterRandomPick::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect)
diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.h b/chalk/plugins/filters/randompickfilter/randompickfilter.h
index 4b50c215a..a4fa1da88 100644
--- a/chalk/plugins/filters/randompickfilter/randompickfilter.h
+++ b/chalk/plugins/filters/randompickfilter/randompickfilter.h
@@ -29,7 +29,7 @@ class KisFilterConfigWidget;
 class ChalkRandomPickFilter : public KParts::Plugin
 {
 public:
-    ChalkRandomPickFilter(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkRandomPickFilter(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkRandomPickFilter();
 };
 
@@ -45,7 +45,7 @@ class KisFilterRandomPick : public KisFilter
         virtual bool supportsPreview() { return true; }
         virtual bool supportsIncrementalPainting() { return false; }
     public:
-        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
         virtual KisFilterConfiguration* configuration(TQWidget*);
 };
 
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc
index 3b8177d4d..a823f8120 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc
@@ -139,11 +139,11 @@ void KisRoundCornersFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst,
     setProgressDone();
 }
 
-KisFilterConfigWidget * KisRoundCornersFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/)
+KisFilterConfigWidget * KisRoundCornersFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/)
 {
     vKisIntegerWidgetParam param;
     param.push_back( KisIntegerWidgetParam( 2, 100, 30, i18n("Radius"), "radius" ) );
-    return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
 }
 
 KisFilterConfiguration* KisRoundCornersFilter::configuration(TQWidget* nwidget)
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h
index ec5fb9fb5..3fdc83d02 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h
@@ -49,7 +49,7 @@ public:
     virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP )
         { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisRoundCornersFilterConfiguration(30)); return list; }
 public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration* configuration(TQWidget*);
     virtual KisFilterConfiguration * configuration() { return new KisRoundCornersFilterConfiguration( 30 ); };
 private:
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc
index f53acf460..14610c8e5 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc
@@ -26,13 +26,13 @@
 typedef KGenericFactory<KisRoundCornersFilterPlugin> KisRoundCornersFilterPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkroundcornersfilter, KisRoundCornersFilterPluginFactory( "chalk" ) )
 
-KisRoundCornersFilterPlugin::KisRoundCornersFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+KisRoundCornersFilterPlugin::KisRoundCornersFilterPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(KisRoundCornersFilterPluginFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisRoundCornersFilter());
     }
 }
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h
index e55239e42..cbf871081 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h
@@ -25,7 +25,7 @@
 class KisRoundCornersFilterPlugin : public KParts::Plugin
 {
 public:
-    KisRoundCornersFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisRoundCornersFilterPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisRoundCornersFilterPlugin();
 };
 
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc
index 6c621e479..f1f9f5dfa 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc
@@ -168,11 +168,11 @@ void KisSmallTilesFilter::createSmallTiles(KisPaintDeviceSP src, KisPaintDeviceS
     setProgressDone();
 }
 
-KisFilterConfigWidget * KisSmallTilesFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/)
+KisFilterConfigWidget * KisSmallTilesFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/)
 {
     vKisIntegerWidgetParam param;
     param.push_back( KisIntegerWidgetParam( 2, 5, 1, i18n("Number of tiles"), "smalltiles" ) );
-    return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
 }
 
 KisFilterConfiguration* KisSmallTilesFilter::configuration(TQWidget* nwidget)
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h
index 8d82eda29..dee775bdc 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h
@@ -59,7 +59,7 @@ public:
     { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisSmallTilesFilterConfiguration(2)); return list; }
 
 public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration * configuration(TQWidget*);
     virtual KisFilterConfiguration * configuration() { return new KisSmallTilesFilterConfiguration( 2 ); };
 
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc
index 5283980c6..6a7fe9ea8 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc
@@ -26,13 +26,13 @@
 typedef KGenericFactory<KisSmallTilesFilterPlugin> KisSmallTilesFilterPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalksmalltilesfilter, KisSmallTilesFilterPluginFactory( "chalk" ) )
 
-KisSmallTilesFilterPlugin::KisSmallTilesFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+KisSmallTilesFilterPlugin::KisSmallTilesFilterPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(KisSmallTilesFilterPluginFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisSmallTilesFilter());
     }
 }
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h
index 601568f20..26c300128 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h
@@ -25,7 +25,7 @@
 class KisSmallTilesFilterPlugin : public KParts::Plugin
 {
 public:
-    KisSmallTilesFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisSmallTilesFilterPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisSmallTilesFilterPlugin();
 };
 
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc
index 9a2f56047..52424ce27 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc
@@ -195,14 +195,14 @@ void KisSobelFilter::sobel(const TQRect & rc, KisPaintDeviceSP src, KisPaintDevi
 }
 
 
-KisFilterConfigWidget * KisSobelFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP)
+KisFilterConfigWidget * KisSobelFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP)
 {
     vKisBoolWidgetParam param;
     param.push_back( KisBoolWidgetParam( true, i18n("Sobel horizontally"), "doHorizontally" ) );
     param.push_back( KisBoolWidgetParam( true, i18n("Sobel vertically"), "doVertically" ) );
     param.push_back( KisBoolWidgetParam( true, i18n("Keep sign of result"), "keepSign" ) );
     param.push_back( KisBoolWidgetParam( true, i18n("Make image opaque"), "makeOpaque" ) );
-    return new KisMultiBoolFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param );
+    return new KisMultiBoolFilterWidget(parent, id().id().ascii(), id().id().ascii(), param );
 }
 
 KisFilterConfiguration* KisSobelFilter::configuration(TQWidget* nwidget)
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h
index 757757bc5..813f81721 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h
@@ -64,7 +64,7 @@ public:
     virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP )
         { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisSobelFilterConfiguration(true,true,true,true)); return list; }
 public:
-    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+    virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
     virtual KisFilterConfiguration* configuration(TQWidget*);
     virtual KisFilterConfiguration * configuration() { return new KisSobelFilterConfiguration( true, true, true, true); };
 private:
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc
index e0ef8c808..3b21c5477 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc
@@ -26,13 +26,13 @@
 typedef KGenericFactory<KisSobelFilterPlugin> KisSobelFilterPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalksobelfilter, KisSobelFilterPluginFactory( "chalk" ) )
 
-KisSobelFilterPlugin::KisSobelFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+KisSobelFilterPlugin::KisSobelFilterPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(KisSobelFilterPluginFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisSobelFilter());
     }
 }
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h
index 87564cfeb..a4cc323a0 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h
@@ -25,7 +25,7 @@
 class KisSobelFilterPlugin : public KParts::Plugin
 {
 public:
-    KisSobelFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisSobelFilterPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisSobelFilterPlugin();
 };
 
diff --git a/chalk/plugins/filters/threadtest/threadtest.cc b/chalk/plugins/filters/threadtest/threadtest.cc
index f96a16167..1274c55f9 100644
--- a/chalk/plugins/filters/threadtest/threadtest.cc
+++ b/chalk/plugins/filters/threadtest/threadtest.cc
@@ -47,13 +47,13 @@
 typedef KGenericFactory<ChalkThreadTest> ChalkThreadTestFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkthreadtest, ChalkThreadTestFactory( "chalk" ) )
 
-ChalkThreadTest::ChalkThreadTest(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkThreadTest::ChalkThreadTest(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkThreadTestFactory::instance());
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * r = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * r = dynamic_cast<KisFilterRegistry *>(parent);
         r->add(new KisFilterInvert());
     }
 }
diff --git a/chalk/plugins/filters/threadtest/threadtest.h b/chalk/plugins/filters/threadtest/threadtest.h
index 26c61a587..d7ebae7f6 100644
--- a/chalk/plugins/filters/threadtest/threadtest.h
+++ b/chalk/plugins/filters/threadtest/threadtest.h
@@ -27,7 +27,7 @@
 class ChalkThreadTest : public KParts::Plugin
 {
 public:
-    ChalkThreadTest(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkThreadTest(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkThreadTest();
 };
 
diff --git a/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc b/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc
index d9539920e..845262b17 100644
--- a/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc
+++ b/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc
@@ -55,9 +55,9 @@ KisUnsharpFilter::KisUnsharpFilter() : KisFilter(id(), "enhance", i18n("&Unsharp
 {
 }
 
-KisFilterConfigWidget * KisUnsharpFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP )
+KisFilterConfigWidget * KisUnsharpFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP )
 {
-    return new KisWdgUnsharp(this, tqparent, "configuration of color to alpha");
+    return new KisWdgUnsharp(this, parent, "configuration of color to alpha");
 }
 
 KisFilterConfiguration* KisUnsharpFilter::configuration(TQWidget* w)
@@ -92,10 +92,10 @@ void KisUnsharpFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi
     kdDebug() << " brush size = " << size << " " << halfSize << endl;
     KisAutobrushShape* kas = new KisAutobrushCircleShape(size, size , halfSize, halfSize);
     
-    TQImage tqmask;
-    kas->createBrush(&tqmask);
+    TQImage mask;
+    kas->createBrush(&mask);
     
-    KisKernelSP kernel = kernelFromTQImage(tqmask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage
+    KisKernelSP kernel = kernelFromTQImage(mask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage
     
     KisPaintDeviceSP interm = new KisPaintDevice(*src);
     KisColorSpace * cs = src->colorSpace();
diff --git a/chalk/plugins/filters/unsharp/kis_unsharp_filter.h b/chalk/plugins/filters/unsharp/kis_unsharp_filter.h
index 0f25f318f..9b92e009c 100644
--- a/chalk/plugins/filters/unsharp/kis_unsharp_filter.h
+++ b/chalk/plugins/filters/unsharp/kis_unsharp_filter.h
@@ -33,14 +33,14 @@ class KisUnsharpFilter : public KisFilter
         KisUnsharpFilter();
     public:
         virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&);
-        static inline KisID id() { return KisID("unsharptqmask", i18n("Unsharp Mask")); };
+        static inline KisID id() { return KisID("unsharpmask", i18n("Unsharp Mask")); };
         virtual bool supportsPainting() { return true; }
         virtual bool supportsPreview() { return true; }
         virtual bool supportsIncrementalPainting() { return false; }
         virtual bool supportsAdjustmentLayers() { return false; }
         virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; };
     public:
-        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
         virtual KisFilterConfiguration* configuration(TQWidget*);
 };
 
diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
index 4a59a2242..627d105cf 100644
--- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
+++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
@@ -30,7 +30,7 @@
 
 #include "wdgunsharp.h"
 
-KisWdgUnsharp::KisWdgUnsharp( KisFilter* , TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name )
+KisWdgUnsharp::KisWdgUnsharp( KisFilter* , TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name )
 {
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgUnsharp(this);
diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h
index 52ffb5849..3b46ff1af 100644
--- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h
+++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h
@@ -35,7 +35,7 @@ class KisWdgUnsharp : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisWdgUnsharp( KisFilter* nfilter, TQWidget * tqparent, const char * name);
+        KisWdgUnsharp( KisFilter* nfilter, TQWidget * parent, const char * name);
         inline WdgUnsharp* widget() { return m_widget; };
         virtual void setConfiguration(KisFilterConfiguration*);
     private:
diff --git a/chalk/plugins/filters/unsharp/unsharp.cc b/chalk/plugins/filters/unsharp/unsharp.cc
index 60516f421..3d90d49ed 100644
--- a/chalk/plugins/filters/unsharp/unsharp.cc
+++ b/chalk/plugins/filters/unsharp/unsharp.cc
@@ -27,8 +27,8 @@
 typedef KGenericFactory<UnsharpPlugin> UnsharpPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkunsharpfilter, UnsharpPluginFactory( "chalk" ) )
 
-UnsharpPlugin::UnsharpPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+UnsharpPlugin::UnsharpPlugin(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(UnsharpPluginFactory::instance());
 
@@ -36,11 +36,11 @@ UnsharpPlugin::UnsharpPlugin(TQObject *tqparent, const char *name, const TQStrin
     kdDebug(41006) << "Extensions Image enhancement Filters plugin. Class: "
           << className()
           << ", Parent: "
-          << tqparent -> className()
+          << parent -> className()
           << "\n";
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisUnsharpFilter());
     }
 }
diff --git a/chalk/plugins/filters/unsharp/unsharp.h b/chalk/plugins/filters/unsharp/unsharp.h
index 59a926940..5717cccc3 100644
--- a/chalk/plugins/filters/unsharp/unsharp.h
+++ b/chalk/plugins/filters/unsharp/unsharp.h
@@ -30,7 +30,7 @@
 class UnsharpPlugin : public KParts::Plugin
 {
 public:
-    UnsharpPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    UnsharpPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~UnsharpPlugin();
 };
 
diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
index 374fc6c8c..e7537c277 100644
--- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
+++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
@@ -27,8 +27,8 @@
 
 #include "wdgwaveoptions.h"
 
-KisWdgWave::KisWdgWave(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name)
-    : KisFilterConfigWidget(tqparent,name)
+KisWdgWave::KisWdgWave(KisFilter* /*nfilter*/, TQWidget* parent, const char* name)
+    : KisFilterConfigWidget(parent,name)
 {
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgWaveOptions(this);
diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.h b/chalk/plugins/filters/wavefilter/kis_wdg_wave.h
index 6f9b0744e..71732bf50 100644
--- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.h
+++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.h
@@ -31,7 +31,7 @@ class KisWdgWave : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisWdgWave(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0);
+        KisWdgWave(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0);
         ~KisWdgWave();
     public:
         inline WdgWaveOptions* widget() { return m_widget; };
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc
index 1d78bafc7..ddcfc4bd4 100644
--- a/chalk/plugins/filters/wavefilter/wavefilter.cc
+++ b/chalk/plugins/filters/wavefilter/wavefilter.cc
@@ -83,14 +83,14 @@ class KisTriangleWaveCurve : public KisWaveCurve {
 
 
 
-ChalkWaveFilter::ChalkWaveFilter(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkWaveFilter::ChalkWaveFilter(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkWaveFilterFactory::instance());
 
 
-    if (tqparent->inherits("KisFilterRegistry")) {
-        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent);
+    if (parent->inherits("KisFilterRegistry")) {
+        KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent);
         manager->add(new KisFilterWave());
     }
 }
@@ -121,9 +121,9 @@ KisFilterConfiguration* KisFilterWave::configuration(TQWidget* w)
     return config;
 }
 
-KisFilterConfigWidget * KisFilterWave::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/)
+KisFilterConfigWidget * KisFilterWave::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/)
 {
-    return new KisWdgWave((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of wave filter").ascii());
+    return new KisWdgWave((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of wave filter").ascii());
 }
 
 void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect)
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.h b/chalk/plugins/filters/wavefilter/wavefilter.h
index 3397ab0bd..8493c4f83 100644
--- a/chalk/plugins/filters/wavefilter/wavefilter.h
+++ b/chalk/plugins/filters/wavefilter/wavefilter.h
@@ -29,7 +29,7 @@ class KisFilterConfigWidget;
 class ChalkWaveFilter : public KParts::Plugin
 {
 public:
-    ChalkWaveFilter(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkWaveFilter(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkWaveFilter();
 };
 
@@ -46,7 +46,7 @@ class KisFilterWave : public KisFilter
         virtual bool supportsIncrementalPainting() { return false; }
         virtual bool supportsAdjustmentLayers() { return false; }
     public:
-        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev);
+        virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev);
         virtual KisFilterConfiguration* configuration(TQWidget*);
 };
 
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
index 5a267f57c..3b48e4396 100644
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
@@ -42,15 +42,15 @@ typedef KGenericFactory<DefaultPaintOpsPlugin> DefaultPaintOpsPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkdefaultpaintops, DefaultPaintOpsPluginFactory( "chalkcore" ) )
 
 
-DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
      setInstance(DefaultPaintOpsPluginFactory::instance());
 
     // This is not a gui plugin; only load it when the doc is created.
-    if ( tqparent->inherits("KisPaintOpRegistry") )
+    if ( parent->inherits("KisPaintOpRegistry") )
     {
-        KisPaintOpRegistry * r = dynamic_cast<KisPaintOpRegistry*>(tqparent);
+        KisPaintOpRegistry * r = dynamic_cast<KisPaintOpRegistry*>(parent);
         // Add hard-coded paint ops. Plugin paintops will add
         // themselves in the plugin initialization code.
         r->add ( new KisAirbrushOpFactory );
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h
index d7afb9d0c..7c037c9ec 100644
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h
@@ -29,7 +29,7 @@ class DefaultPaintOpsPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    DefaultPaintOpsPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    DefaultPaintOpsPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~DefaultPaintOpsPlugin();
 };
 
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
index 1977d58b0..c5f938642 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
@@ -115,8 +115,8 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info
         dab = brush->image(device->colorSpace(), info, xFraction, yFraction);
     }
     else {
-        KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction);
-        dab = computeDab(tqmask);
+        KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction);
+        dab = computeDab(mask);
     }
 
     m_painter->setDab(dab); // Cache dab for future paints in the painter.
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
index ffa51114e..1ec165619 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
@@ -55,10 +55,10 @@ KisPaintOp * KisBrushOpFactory::createOp(const KisPaintOpSettings *settings, Kis
     return op;
 }
 
-KisBrushOpSettings::KisBrushOpSettings(TQWidget *tqparent)
-    : super(tqparent)
+KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent)
+    : super(parent)
 {
-    m_optionsWidget = new TQWidget(tqparent, "brush option widget");
+    m_optionsWidget = new TQWidget(parent, "brush option widget");
     TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget);
     l->setAutoAdd(true);
     m_pressureVariation = new TQLabel(i18n("Pressure variation: "), m_optionsWidget);
@@ -125,13 +125,13 @@ bool KisBrushOpSettings::varyDarken() const
     return m_darken->isChecked();
 }
 
-KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice)
+KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice)
 {
     if (inputDevice == KisInputDevice::mouse()) {
         // No options for mouse, only tablet devices
         return 0;
     } else {
-        return new KisBrushOpSettings(tqparent);
+        return new KisBrushOpSettings(parent);
     }
 }
 
@@ -180,13 +180,13 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
 
     // Painting should be implemented according to the following algorithm:
     // retrieve brush
-    // if brush == tqmask
-    //          retrieve tqmask
+    // if brush == mask
+    //          retrieve mask
     // else if brush == image
     //          retrieve image
-    // subsample (tqmask | image) for position -- pos should be double!
-    // apply filters to tqmask (colour | gradient | pattern | etc.
-    // composite filtered tqmask into temporary layer
+    // subsample (mask | image) for position -- pos should be double!
+    // apply filters to mask (colour | gradient | pattern | etc.
+    // composite filtered mask into temporary layer
     // composite temporary layer into target layer
     // @see: doc/brush.txt
 
@@ -245,8 +245,8 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
         dab = brush->image(device->colorSpace(), adjustedInfo, xFraction, yFraction);
     }
     else {
-        KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction);
-        dab = computeDab(tqmask);
+        KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction);
+        dab = computeDab(mask);
     }
 
     m_painter->setPressure(adjustedInfo.pressure);
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.h b/chalk/plugins/paintops/defaultpaintops/kis_brushop.h
index 6475b3d74..4782efbd4 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.h
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.h
@@ -42,7 +42,7 @@ public:
     virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter);
     virtual KisID id() { return KisID("paintbrush", i18n("Pixel Brush")); }
     virtual TQString pixmap() { return "paintbrush.png"; }
-    virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice);
+    virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice);
 };
 
 class KisBrushOpSettings : public TQObject, public KisPaintOpSettings {
@@ -50,7 +50,7 @@ class KisBrushOpSettings : public TQObject, public KisPaintOpSettings {
   TQ_OBJECT
     typedef KisPaintOpSettings super;
 public:
-    KisBrushOpSettings(TQWidget *tqparent);
+    KisBrushOpSettings(TQWidget *parent);
 
     bool varySize() const;
     bool varyOpacity() const;
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
index 7ad4a4da8..3294d8469 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
@@ -125,8 +125,8 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf
         dab->convertTo(KisMetaRegistry::instance()->csRegistry()->getAlpha8());
     }
     else {
-        KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction);
-        dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
+        KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction);
+        dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
     }
 
     m_painter->setPressure(info.pressure);
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
index 794923a4e..0bfc6fd28 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
@@ -94,20 +94,20 @@ void KisEraseOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
     splitCoordinate(pt.x(), &destX, &xFraction);
     splitCoordinate(pt.y(), &destY, &yFraction);
 
-    KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction);
+    KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction);
 
     KisPaintDeviceSP dab = new KisPaintDevice(device->colorSpace(), "erase op dab");
     Q_CHECK_PTR(dab);
 
-    TQ_INT32 maskWidth = tqmask->width();
-    TQ_INT32 maskHeight = tqmask->height();
+    TQ_INT32 maskWidth = mask->width();
+    TQ_INT32 maskHeight = mask->height();
 
     TQRect dstRect;
 
     KisRectIteratorPixel it = dab->createRectIterator(0, 0, maskWidth, maskHeight, true);
     KisColorSpace* cs = dab->colorSpace();
     while (!it.isDone()) {
-        cs->setAlpha(it.rawData(), TQ_UINT8_MAX - tqmask->alphaAt(it.x(), it.y()), 1);
+        cs->setAlpha(it.rawData(), TQ_UINT8_MAX - mask->alphaAt(it.x(), it.y()), 1);
         ++it;
     }
 
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
index e8780100f..41c2607eb 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
@@ -79,9 +79,9 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
         dab = brush->image(device->colorSpace(), info);
     }
     else {
-        // Compute tqmask without sub-pixel positioning
-        KisAlphaMaskSP tqmask = brush->tqmask(info);
-        dab = computeDab(tqmask);
+        // Compute mask without sub-pixel positioning
+        KisAlphaMaskSP mask = brush->mask(info);
+        dab = computeDab(mask);
     }
 
     m_painter->setPressure(info.pressure);
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
index a493f132f..c5f4e6eb0 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
@@ -56,10 +56,10 @@ KisPaintOp * KisSmudgeOpFactory::createOp(const KisPaintOpSettings *settings, Ki
     return op;
 }
 
-KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *tqparent, bool isTablet)
-    : super(tqparent)
+KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet)
+    : super(parent)
 {
-    m_optionsWidget = new TQWidget(tqparent, "brush option widget");
+    m_optionsWidget = new TQWidget(parent, "brush option widget");
     TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget);
     l->setAutoAdd(true);
     m_rateLabel = new TQLabel(i18n("Rate: "), m_optionsWidget);
@@ -145,13 +145,13 @@ bool KisSmudgeOpSettings::varyOpacity() const
     return m_opacity ? m_opacity->isChecked() : false;
 }
 
-KisPaintOpSettings* KisSmudgeOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice)
+KisPaintOpSettings* KisSmudgeOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice)
 {
     if (inputDevice == KisInputDevice::mouse()) {
         // No options for mouse, only tablet devices
-        return new KisSmudgeOpSettings(tqparent, false);
+        return new KisSmudgeOpSettings(parent, false);
     } else {
-        return new KisSmudgeOpSettings(tqparent, true);
+        return new KisSmudgeOpSettings(parent, true);
     }
 }
 
@@ -205,13 +205,13 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
 
     // Painting should be implemented according to the following algorithm:
     // retrieve brush
-    // if brush == tqmask
-    //          retrieve tqmask
+    // if brush == mask
+    //          retrieve mask
     // else if brush == image
     //          retrieve image
-    // subsample (tqmask | image) for position -- pos should be double!
-    // apply filters to tqmask (colour | gradient | pattern | etc.
-    // composite filtered tqmask into temporary layer
+    // subsample (mask | image) for position -- pos should be double!
+    // apply filters to mask (colour | gradient | pattern | etc.
+    // composite filtered mask into temporary layer
     // composite temporary layer into target layer
     // @see: doc/brush.txt
 
@@ -256,8 +256,8 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
         dab->convertTo(KisMetaRegistry::instance()->csRegistry()->getAlpha8());
     }
     else {
-        KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction);
-        dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
+        KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction);
+        dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
     }
 
     
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h
index d9c8872d6..5fd732f56 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h
@@ -40,7 +40,7 @@ public:
     virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter);
     virtual KisID id() { return KisID("smudge", i18n("Smudge Brush")); }
     virtual TQString pixmap() { return "paintbrush.png"; }
-    virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice);
+    virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice);
 };
 
 class KisSmudgeOpSettings : public TQObject, public KisPaintOpSettings {
@@ -48,7 +48,7 @@ class KisSmudgeOpSettings : public TQObject, public KisPaintOpSettings {
   TQ_OBJECT
     typedef KisPaintOpSettings super;
 public:
-    KisSmudgeOpSettings(TQWidget *tqparent, bool isTablet);
+    KisSmudgeOpSettings(TQWidget *parent, bool isTablet);
 
     int rate() const;
     bool varyRate() const;
diff --git a/chalk/plugins/tools/defaulttools/default_tools.cc b/chalk/plugins/tools/defaulttools/default_tools.cc
index 61d06e982..0a9298dad 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.cc
+++ b/chalk/plugins/tools/defaulttools/default_tools.cc
@@ -56,14 +56,14 @@ typedef KGenericFactory<DefaultTools> DefaultToolsFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkdefaulttools, DefaultToolsFactory( "chalk" ) )
 
 
-DefaultTools::DefaultTools(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+DefaultTools::DefaultTools(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(DefaultToolsFactory::instance());
 
-     if ( tqparent->inherits("KisToolRegistry") )
+     if ( parent->inherits("KisToolRegistry") )
      {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
 
         r->add(new KisToolFillFactory());
         r->add(new KisToolGradientFactory());
diff --git a/chalk/plugins/tools/defaulttools/default_tools.h b/chalk/plugins/tools/defaulttools/default_tools.h
index c50a9147b..891f2b9aa 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.h
+++ b/chalk/plugins/tools/defaulttools/default_tools.h
@@ -36,7 +36,7 @@ class DefaultTools : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    DefaultTools(TQObject *tqparent, const char *name, const TQStringList &);
+    DefaultTools(TQObject *parent, const char *name, const TQStringList &);
     virtual ~DefaultTools();
 
 };
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
index 373e0a075..384e4e263 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
@@ -147,9 +147,9 @@ void KisToolBrush::slotSetPaintingMode( int mode )
 }
 
 
-TQWidget* KisToolBrush::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolBrush::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
     m_chkDirect = new TQCheckBox(i18n("Paint direct"), widget, "chkDirect");
     m_chkDirect->setChecked(true);
     connect(m_chkDirect, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotSetPaintingMode(int)));
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.h b/chalk/plugins/tools/defaulttools/kis_tool_brush.h
index a23e8d12a..cc40a8c0f 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.h
@@ -45,7 +45,7 @@ public:
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
     virtual TQ_UINT32 priority() { return 0; }
-    TQWidget* createOptionWidget(TQWidget* tqparent);
+    TQWidget* createOptionWidget(TQWidget* parent);
 
 protected:
     
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
index b238e746d..6aff68c8d 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
@@ -221,9 +221,9 @@ void KisToolColorPicker::setup(KActionCollection *collection)
     }
 }
 
-TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* parent)
 {
-    m_optionsWidget = new ColorPickerOptionsWidget(tqparent);
+    m_optionsWidget = new ColorPickerOptionsWidget(parent);
 
     m_optionsWidget->cbUpdateCurrentColour->setChecked(m_updateColor);
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
index ab59ef172..b6ee36d32 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
@@ -42,7 +42,7 @@ public:
     virtual void update(KisCanvasSubject *subject);
     virtual void setup(KActionCollection *collection);
     virtual void buttonPress(KisButtonPressEvent *e);
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
     virtual enumToolType toolType() { return TOOL_FILL; }
     virtual TQ_UINT32 priority() { return 3; }
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
index 9619c6aea..341bbe9af 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
@@ -230,9 +230,9 @@ TQString KisToolDuplicate::quickHelp() const {
     return i18n("To start, shift-click on the place you want to duplicate from. Then you can start painting. An indication of where you are copying from will be displayed while drawing and moving the mouse.");
 }
 
-TQWidget* KisToolDuplicate::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolDuplicate::createOptionWidget(TQWidget* parent)
 {
-    TQWidget* widget = KisToolPaint::createOptionWidget(tqparent);
+    TQWidget* widget = KisToolPaint::createOptionWidget(parent);
     m_healing = new TQCheckBox(widget);
     m_healing->setChecked( false);
     addOptionWidgetOption(m_healing, new TQLabel(i18n("Healing"), widget ));
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
index 8a2983180..ec04a592b 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
@@ -52,7 +52,7 @@ public:
                  const double yTilt);
 
     virtual TQString quickHelp() const;
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 
 protected slots:
     virtual void activate();
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
index 5a919771d..f15bf7781 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
@@ -158,9 +158,9 @@ void KisToolFill::buttonRelease(KisButtonReleaseEvent *e)
     notifyModified();
 }
 
-TQWidget* KisToolFill::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolFill::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
 
     m_lbThreshold = new TQLabel(i18n("Threshold: "), widget);
     m_slThreshold = new KIntNumInput( widget, "int_widget");
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.h b/chalk/plugins/tools/defaulttools/kis_tool_fill.h
index 61087243c..01b1f139f 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.h
@@ -55,7 +55,7 @@ public:
 
     bool flood(int startX, int startY);
 
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 
 public slots:
     virtual void slotSetThreshold(int);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
index 4eb685a58..6df9f8da4 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
@@ -226,9 +226,9 @@ void KisToolGradient::paintLine(KisCanvasPainter& gc)
     }
 }
 
-TQWidget* KisToolGradient::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
     Q_CHECK_PTR(widget);
 
     m_lbShape = new TQLabel(i18n("Shape:"), widget);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
index 59d78ad30..29df8bf7b 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
@@ -67,7 +67,7 @@ public:
     virtual void paint(KisCanvasPainter& gc);
     virtual void paint(KisCanvasPainter& gc, const TQRect& rc);
 
-    TQWidget* createOptionWidget(TQWidget* tqparent);
+    TQWidget* createOptionWidget(TQWidget* parent);
 
 public slots:
     void slotSetShape(int);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
index df2479172..bf23b4412 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
@@ -121,10 +121,10 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e)
         TQ_INT32 height = boundingRect.height();
         TQ_INT32 width = boundingRect.width();
         KisPaintLayer *layer = new KisPaintLayer(img, '"' + text + '"', OPACITY_OPAQUE);
-        KisGroupLayerSP tqparent = img->rootLayer();
+        KisGroupLayerSP parent = img->rootLayer();
         if (img->activeLayer())
-            tqparent = img->activeLayer()->tqparent();
-        img->addLayer(layer, tqparent, img->activeLayer());
+            parent = img->activeLayer()->parent();
+        img->addLayer(layer, parent, img->activeLayer());
         for (int y = 0; y < height; y++) {
             for (int x = 0; x < width; x++) {
                 TQRgb pixel = image.pixel(x, y);
@@ -155,13 +155,13 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e)
 }
 
 void KisToolText::setFont() {
-    KFontDialog::getFont( m_font, false/*, TQWidget* tqparent! */ );
+    KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ );
     m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize()));
 }
 
-TQWidget* KisToolText::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolText::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
 
     m_lbFont = new TQLabel(i18n("Font: "), widget);
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.h b/chalk/plugins/tools/defaulttools/kis_tool_text.h
index b2aa7e186..2625fb58d 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.h
@@ -47,7 +47,7 @@ public:
     virtual void buttonPress(KisButtonPressEvent*);
     virtual void buttonRelease(KisButtonReleaseEvent *e);
 
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 public slots:
     virtual void setFont();
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
index ff5242d65..4a59c3845 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
@@ -100,7 +100,7 @@ void KisToolSelectBrush::initPaint(KisEvent* /*e*/)
     KisPaintOp * op = KisPaintOpRegistry::instance()->paintOp("paintbrush", 0, painter());
     painter()->setPaintOp(op); // And now the painter owns the op and will destroy it.
 
-    // Set the cursor -- ideally. this should be a tqmask created from the brush,
+    // Set the cursor -- ideally. this should be a mask created from the brush,
     // now that X11 can handle colored cursors.
 #if 0
     // Setting cursors has no effect until the tool is selected again; this
@@ -143,12 +143,12 @@ void KisToolSelectBrush::setup(KActionCollection *collection)
     }
 }
 
-TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent)
 {
-    Q_UNUSED(tqparent);
+    Q_UNUSED(parent);
     // Commented out due to the fact that this doesn't actually work if you change the action
 #if 0
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Selection Brush"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
index 374050f67..faeb32d8b 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
@@ -47,7 +47,7 @@ public:
     virtual void setup(KActionCollection *collection);
     virtual TQ_UINT32 priority() { return 1; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
 public slots:
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
index c4c908fc6..cc1646808 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
@@ -183,9 +183,9 @@ void KisToolSelectContiguous::slotSetAction(int action)
 }
 
 
-TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Contiguous Area Selection"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
index e4beb6b7e..688276e0d 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
@@ -54,7 +54,7 @@ public:
     virtual TQ_UINT32 priority() { return 7; }
     virtual enumToolType toolType() { return TOOL_SELECT; };
 
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
         virtual TQWidget* optionWidget();
 
     virtual void buttonPress(KisButtonPressEvent *event);
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
index efdae2f32..d16ab740e 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
@@ -297,9 +297,9 @@ void KisToolSelectElliptical::setup(KActionCollection *collection)
     }
 }
 
-TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Elliptical Selection"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
index f0d1a039c..4c21cfcdc 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
@@ -46,7 +46,7 @@ public:
 
     virtual void setup(KActionCollection *collection);
     virtual TQ_UINT32 priority() { return 4; }
-    virtual TQWidget * createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget * createOptionWidget(TQWidget* parent);
         virtual TQWidget* optionWidget();
     virtual enumToolType toolType() { return TOOL_SELECT; }
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
index 58a7778c0..118281e17 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
@@ -100,7 +100,7 @@ void KisToolSelectEraser::initPaint(KisEvent */*e*/)
     KisPaintOp * op = KisPaintOpRegistry::instance()->paintOp("eraser", 0, painter());
     painter()->setPaintOp(op); // And now the painter owns the op and will destroy it.
 
-    // Set the cursor -- ideally. this should be a tqmask created from the brush,
+    // Set the cursor -- ideally. this should be a mask created from the brush,
     // now that X11 can handle colored cursors.
 #if 0
     // Setting cursors has no effect until the tool is selected again; this
@@ -130,12 +130,12 @@ void KisToolSelectEraser::setup(KActionCollection *collection)
     }
 }
 
-TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent)
 {
-    Q_UNUSED(tqparent);
+    Q_UNUSED(parent);
     // Commented out due to the fact that this doesn't actually work if you change the action
 #if 0
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Selection Eraser"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
index 85bd55097..c796ec3c7 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
@@ -45,7 +45,7 @@ public:
     virtual void setup(KActionCollection *collection);
     virtual TQ_UINT32 priority() { return 2; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
 public slots:
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
index b81762fb4..8bac379ce 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
@@ -267,9 +267,9 @@ void KisToolSelectOutline::setup(KActionCollection *collection)
 }
 
 
-TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Outline Selection"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
index 74ecab780..08119c96a 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
@@ -52,7 +52,7 @@ public:
     virtual void move(KisMoveEvent *event);
     virtual void buttonRelease(KisButtonReleaseEvent *event);
 
-    TQWidget* createOptionWidget(TQWidget* tqparent);
+    TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
 public slots:
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
index 7bac7cc32..85a53c94c 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
@@ -286,9 +286,9 @@ void KisToolSelectPolygonal::setup(KActionCollection *collection)
 }
 
 
-TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Polygonal Selection"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
index 65a32ee6b..6e2d62fa8 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
@@ -58,7 +58,7 @@ public:
     virtual void doubleClick(KisDoubleClickEvent * event);
     
     void finish();
-    TQWidget* createOptionWidget(TQWidget* tqparent);
+    TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
 public slots:
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
index aa7052af3..54bfbdd6d 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
@@ -298,9 +298,9 @@ void KisToolSelectRectangular::setup(KActionCollection *collection)
     }
 }
 
-TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Rectangular Selection"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
index eb286ccad..b2f8ecad4 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
@@ -44,7 +44,7 @@ public:
     virtual void setup(KActionCollection *collection);
     virtual TQ_UINT32 priority() { return 3; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
-    virtual TQWidget * createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget * createOptionWidget(TQWidget* parent);
         virtual TQWidget* optionWidget();
 
     virtual void paint(KisCanvasPainter& gc);
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cc
index db4df1ab0..fb0e61912 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.cc
+++ b/chalk/plugins/tools/selectiontools/selection_tools.cc
@@ -51,14 +51,14 @@ typedef KGenericFactory<SelectionTools> SelectionToolsFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkselectiontools, SelectionToolsFactory( "chalk" ) )
 
 
-SelectionTools::SelectionTools(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+SelectionTools::SelectionTools(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
      setInstance(SelectionToolsFactory::instance());
 
-     if ( tqparent->inherits("KisToolRegistry") )
+     if ( parent->inherits("KisToolRegistry") )
      {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
         r->add(new KisToolSelectOutlineFactory());
         r->add(new KisToolSelectPolygonalFactory());
         r->add(new KisToolSelectRectangularFactory());
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.h b/chalk/plugins/tools/selectiontools/selection_tools.h
index 2e448e3ed..b3650ff2e 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.h
+++ b/chalk/plugins/tools/selectiontools/selection_tools.h
@@ -36,7 +36,7 @@ class SelectionTools : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    SelectionTools(TQObject *tqparent, const char *name, const TQStringList &);
+    SelectionTools(TQObject *parent, const char *name, const TQStringList &);
     virtual ~SelectionTools();
 
 };
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
index 0d7d9728e..8f5c9e5f8 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
@@ -698,9 +698,9 @@ void KisToolCrop::setOptionWidgetRatio(double ratio)
 }
 
 
-TQWidget* KisToolCrop::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolCrop::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new WdgToolCrop(tqparent);
+    m_optWidget = new WdgToolCrop(parent);
     Q_CHECK_PTR(m_optWidget);
 
     connect(m_optWidget->bnCrop, TQT_SIGNAL(clicked()), this, TQT_SLOT(crop()));
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.h b/chalk/plugins/tools/tool_crop/kis_tool_crop.h
index 7ad7c9fdb..0f4f677ad 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.h
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.h
@@ -50,7 +50,7 @@ public:
 
     virtual void update(KisCanvasSubject *subject);
 
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
     virtual void setup(KActionCollection *collection);
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cc
index 599c7562c..c624d62f8 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/tool_crop.cc
@@ -42,14 +42,14 @@ typedef KGenericFactory<ToolCrop> ToolCropFactory;
 K_EXPORT_COMPONENT_FACTORY( chalktoolcrop, ToolCropFactory( "chalk" ) )
 
 
-ToolCrop::ToolCrop(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ToolCrop::ToolCrop(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(ToolCropFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
         r->add(new KisToolCropFactory());
     }
 
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.h b/chalk/plugins/tools/tool_crop/tool_crop.h
index df5d7c28a..263fb1c29 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.h
+++ b/chalk/plugins/tools/tool_crop/tool_crop.h
@@ -31,7 +31,7 @@ class ToolCrop : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ToolCrop(TQObject *tqparent, const char *name, const TQStringList &);
+    ToolCrop(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ToolCrop();
 
 private:
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
index 08becf67c..d4a8605d8 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
@@ -552,12 +552,12 @@ void KisToolCurve::selectCurve()
     draw(false);
 }
 
-TQWidget* KisToolCurve::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolCurve::createOptionWidget(TQWidget* parent)
 {
     if (toolType() == TOOL_SHAPE || toolType() == TOOL_FREEHAND)
-        return super::createOptionWidget(tqparent);
+        return super::createOptionWidget(parent);
     else if (toolType() == TOOL_SELECT)
-        return createSelectionOptionWidget(tqparent);
+        return createSelectionOptionWidget(parent);
     else
         kdDebug(0) << "NO SUPPORT FOR THIS TOOL TYPE" << endl;
     return 0;
@@ -568,9 +568,9 @@ void KisToolCurve::slotSetAction(int action) {
         m_selectAction =(enumSelectionMode)action;
 }
 
-TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(m_UIName);
 
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.h b/chalk/plugins/tools/tool_curves/kis_tool_curve.h
index 74d1ccda5..d1c0886c4 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.h
@@ -51,7 +51,7 @@ public:
     virtual ~KisToolCurve();
 
     virtual void update (KisCanvasSubject *subject);
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 
     virtual void buttonPress(KisButtonPressEvent *event);
     virtual void move(KisMoveEvent *event);
@@ -179,7 +179,7 @@ public:
     /*
      * This initializes our Option Widget (called by createOptionWidget())
      */
-    virtual TQWidget* createSelectionOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createSelectionOptionWidget(TQWidget* parent);
     
     /*
      * This return our internal KisSelectionOptions if toolType() returns TOOL_SELECT
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
index 4b7e51d4b..42806771f 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
@@ -100,14 +100,14 @@ public:
         m_hCost = node.hCost();
         m_tCost = node.tCost();
         m_malus = node.malus();
-        m_parent = node.tqparent();
+        m_parent = node.parent();
     }
 
-    Node(const TQPoint& tqparent, const TQPoint& pos, int g, int h, bool malus)
+    Node(const TQPoint& parent, const TQPoint& pos, int g, int h, bool malus)
         : m_pos(pos), m_hCost(h), m_malus(malus)
     {
         setGCost(g);
-        m_parent = tqparent;
+        m_parent = parent;
     }
     ~Node ()
     {
@@ -120,7 +120,7 @@ public:
     TQPoint pos () const {return m_pos;}
     int col () const {return m_pos.x();}
     int row () const {return m_pos.y();}
-    TQPoint tqparent () const {return m_parent;}
+    TQPoint parent () const {return m_parent;}
 
     void setGCost (int g)
     {
@@ -230,8 +230,8 @@ KisKernelSP createKernel( TQ_INT32 i0, TQ_INT32 i1, TQ_INT32 i2,
     return kernel;
 }
 
-KisCurveMagnetic::KisCurveMagnetic (KisToolMagnetic *tqparent)
-    : m_parent(tqparent)
+KisCurveMagnetic::KisCurveMagnetic (KisToolMagnetic *parent)
+    : m_parent(parent)
 {
     m_standardkeepselected = false;
 }
@@ -299,9 +299,9 @@ void KisCurveMagnetic::calculateCurve (KisCurve::iterator p1, KisCurve::iterator
             int col = (*i).col();
             int row = (*i).row();
             if ((*i) == endNode) {
-                while (current.tqparent() != TQPoint(-1,-1)) {
+                while (current.parent() != TQPoint(-1,-1)) {
                     it = addPoint(it,KisPoint(tl+current.pos()),false,false,LINEHINT);
-                    current = closedMatrix[current.tqparent().x()][current.tqparent().y()];
+                    current = closedMatrix[current.parent().x()][current.parent().y()];
                 }
                 return;
             }
@@ -759,9 +759,9 @@ void KisToolMagnetic::slotSetDistance (int dist)
     m_distance = dist;
 }
 
-TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = super::createOptionWidget(tqparent);
+    m_optWidget = super::createOptionWidget(parent);
     TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     TQGridLayout *box = new TQGridLayout(l, 2, 2, 3);
     box->setColStretch(0, 1);
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
index ac7327fe8..ca15aaef0 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
@@ -53,7 +53,7 @@ class KisCurveMagnetic : public KisCurve {
 
 public:
 
-    KisCurveMagnetic (KisToolMagnetic *tqparent);
+    KisCurveMagnetic (KisToolMagnetic *parent);
     ~KisCurveMagnetic ();
 
     virtual KisCurve::iterator addPivot (iterator, const KisPoint&);
@@ -88,7 +88,7 @@ public:
     virtual KisCurve::iterator selectByMouse(KisCurve::iterator it);
 
     bool editingMode() {return m_editingMode;}
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 
 public slots:
 
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc
index f9f5be337..d941c2dc0 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cc
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cc
@@ -45,14 +45,14 @@ typedef KGenericFactory<ToolCurves> ToolCurvesFactory;
 K_EXPORT_COMPONENT_FACTORY( chalktoolcurves, ToolCurvesFactory( "chalk" ) )
 
 
-ToolCurves::ToolCurves(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ToolCurves::ToolCurves(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(ToolCurvesFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent );
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent );
         r->add(new KisToolBezierPaintFactory());
         r->add(new KisToolBezierSelectFactory());
         r->add(new KisToolMagneticFactory());
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.h b/chalk/plugins/tools/tool_curves/tool_curves.h
index 82199e48b..64bd1507f 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.h
+++ b/chalk/plugins/tools/tool_curves/tool_curves.h
@@ -28,7 +28,7 @@ class ToolCurves : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ToolCurves(TQObject *tqparent, const char *name, const TQStringList &);
+    ToolCurves(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ToolCurves();
 
 };
diff --git a/chalk/plugins/tools/tool_filter/kis_filterop.cc b/chalk/plugins/tools/tool_filter/kis_filterop.cc
index 2296965c2..3c34abcec 100644
--- a/chalk/plugins/tools/tool_filter/kis_filterop.cc
+++ b/chalk/plugins/tools/tool_filter/kis_filterop.cc
@@ -82,14 +82,14 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
     splitCoordinate(pt.x(), &x, &xFraction);
     splitCoordinate(pt.y(), &y, &yFraction);
 
-    // Filters always work with a tqmask, never with an image; that
+    // Filters always work with a mask, never with an image; that
     // wouldn't be useful at all.
-    KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction);
+    KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction);
 
     m_painter->setPressure(info.pressure);
 
-    TQ_INT32 maskWidth = tqmask->width();
-    TQ_INT32 maskHeight = tqmask->height();
+    TQ_INT32 maskWidth = mask->width();
+    TQ_INT32 maskHeight = mask->height();
 
     // Create a temporary paint device
     KisPaintDeviceSP tmpDev = new KisPaintDevice(colorSpace, "filterop tmpdev");
@@ -105,14 +105,14 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
     filter->process( tmpDev,  tmpDev, m_filterConfiguration, TQRect( 0, 0, maskWidth, maskHeight ));
     filter->enableProgress();
 
-    // Apply the tqmask on the paint device (filter before tqmask because edge pixels may be important)
+    // Apply the mask on the paint device (filter before mask because edge pixels may be important)
     for (int y = 0; y < maskHeight; y++)
     {
         KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, maskWidth, false);
         int x=0;
         while(! hiter.isDone())
         {
-            TQ_UINT8 alpha = tqmask->alphaAt( x++, y );
+            TQ_UINT8 alpha = mask->alphaAt( x++, y );
             colorSpace->setAlpha(hiter.rawData(), alpha, 1);
 
             ++hiter;
diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
index e9fdad9ec..e53c96da8 100644
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
@@ -96,9 +96,9 @@ void KisToolFilter::initPaint(KisEvent *e)
     dynamic_cast<KisFilterOp *>(op)->setFilterConfiguration( m_filter->configuration( m_filterConfigurationWidget) );
 }
 
-TQWidget* KisToolFilter::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolFilter::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
 
     m_cbFilter = new KisCmbIDList(widget);
     Q_CHECK_PTR(m_cbFilter);
diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.h b/chalk/plugins/tools/tool_filter/kis_tool_filter.h
index e8b5e86b7..651fbfb89 100644
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.h
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.h
@@ -46,7 +46,7 @@ public:
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_FREEHAND; }
     virtual TQ_UINT32 priority() { return 1; }
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 
 public slots:
     void changeFilter( const KisID & filter);
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cc
index 484ed39ac..b5d7c4b56 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/tool_filter.cc
@@ -44,14 +44,14 @@ typedef KGenericFactory<ToolFilter> ToolFilterFactory;
 K_EXPORT_COMPONENT_FACTORY( chalktoolfilter, ToolFilterFactory( "chalk" ) )
 
 
-ToolFilter::ToolFilter(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ToolFilter::ToolFilter(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
      setInstance(ToolFilterFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
         r->add( new KisToolFilterFactory());
 
         // XXX: Put this in a separate plugin?
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.h b/chalk/plugins/tools/tool_filter/tool_filter.h
index 7bf33dca5..fba259c73 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.h
+++ b/chalk/plugins/tools/tool_filter/tool_filter.h
@@ -31,7 +31,7 @@ class ToolFilter : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ToolFilter(TQObject *tqparent, const char *name, const TQStringList &);
+    ToolFilter(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ToolFilter();
 
 private:
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
index 061db8815..ae07e5895 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
@@ -485,7 +485,7 @@ void KisToolPerspectiveGrid::setup(KActionCollection *collection)
 }
 
 
-// TQWidget* KisToolPerspectiveGrid::createOptionWidget(TQWidget* tqparent)
+// TQWidget* KisToolPerspectiveGrid::createOptionWidget(TQWidget* parent)
 // {
 //     return 0;
 // }
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h
index 69f6407ab..f7415f630 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h
@@ -56,7 +56,7 @@ public:
     virtual void move(KisMoveEvent *event);
     virtual void buttonRelease(KisButtonReleaseEvent *event);
     
-//     TQWidget* createOptionWidget(TQWidget* tqparent);
+//     TQWidget* createOptionWidget(TQWidget* parent);
 //     virtual TQWidget* optionWidget();
 
 public slots:
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
index 69158e21f..12615387f 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
@@ -42,14 +42,14 @@ typedef KGenericFactory<ToolPerspectiveGrid> ToolPerspectiveGridFactory;
 K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) )
 
 
-ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(ToolPerspectiveGridFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
         r->add(new KisToolPerspectiveGridFactory());
     }
 
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h
index aed4a60cd..aeb99c746 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h
@@ -31,7 +31,7 @@ class ToolPerspectiveGrid : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ToolPerspectiveGrid(TQObject *tqparent, const char *name, const TQStringList &);
+    ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ToolPerspectiveGrid();
 
 private:
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
index dbcfd74c0..07598b7de 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
@@ -681,10 +681,10 @@ void KisToolPerspectiveTransform::slotLayerActivated(KisLayerSP)
 }
 
 
-TQWidget* KisToolPerspectiveTransform::createOptionWidget(TQWidget* /*tqparent*/)
+TQWidget* KisToolPerspectiveTransform::createOptionWidget(TQWidget* /*parent*/)
 {
 #if 0
-    m_optWidget = new WdgToolPerspectiveTransform(tqparent);
+    m_optWidget = new WdgToolPerspectiveTransform(parent);
     Q_CHECK_PTR(m_optWidget);
 
     m_optWidget->cmbFilter->clear();
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h
index 5d637ae54..690e356ca 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h
@@ -53,7 +53,7 @@ public:
     KisToolPerspectiveTransform();
     virtual ~KisToolPerspectiveTransform();
 
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
     virtual void setup(KActionCollection *collection);
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
index 2c3c85d48..24d716201 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
@@ -42,15 +42,15 @@ typedef KGenericFactory<ToolPerspectiveTransform> ToolPerspectiveTransformFactor
 K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) )
 
 
-ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(ToolPerspectiveTransformFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
         kdDebug() << " add perspective transform tool to the registry" << endl;
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
         r->add(new KisToolPerspectiveTransformFactory());
     }
 
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h
index 1cbeadee3..af412a587 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h
@@ -31,7 +31,7 @@ class ToolPerspectiveTransform : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ToolPerspectiveTransform(TQObject *tqparent, const char *name, const TQStringList &);
+    ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ToolPerspectiveTransform();
 
 private:
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cc
index 3dbd15d62..5ace60794 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cc
@@ -42,14 +42,14 @@ typedef KGenericFactory<ToolPolygon> ToolPolygonFactory;
 K_EXPORT_COMPONENT_FACTORY( chalktoolpolygon, ToolPolygonFactory( "chalk" ) )
 
 
-ToolPolygon::ToolPolygon(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ToolPolygon::ToolPolygon(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(ToolPolygonFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent );
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent );
         r->add(new KisToolPolygonFactory());
     }
 
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.h b/chalk/plugins/tools/tool_polygon/tool_polygon.h
index ec816736c..b6f35bc66 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.h
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.h
@@ -31,7 +31,7 @@ class ToolPolygon : public KParts::Plugin
 
 public:
 
-    ToolPolygon(TQObject *tqparent, const char *name, const TQStringList &);
+    ToolPolygon(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ToolPolygon();
 
 };
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cc
index 369169c9f..fe9eb0024 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cc
@@ -43,14 +43,14 @@ typedef KGenericFactory<ToolPolyline> ToolPolylineFactory;
 K_EXPORT_COMPONENT_FACTORY( chalktoolpolyline, ToolPolylineFactory( "chalk" ) )
 
 
-ToolPolyline::ToolPolyline(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ToolPolyline::ToolPolyline(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(ToolPolylineFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
 
         r->add(new KisToolPolylineFactory());
     }
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.h b/chalk/plugins/tools/tool_polyline/tool_polyline.h
index 9f483363f..fdfa5427b 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.h
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.h
@@ -31,7 +31,7 @@ class ToolPolyline : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ToolPolyline(TQObject *tqparent, const char *name, const TQStringList &);
+    ToolPolyline(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ToolPolyline();
 
 private:
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
index 2dfe40f14..700efa4b6 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
@@ -226,9 +226,9 @@ void KisToolSelectSimilar::slotSetAction(int action)
     m_defaultSelectAction = (enumSelectionMode)action;
 }
 
-TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new TQWidget(tqparent);
+    m_optWidget = new TQWidget(parent);
     Q_CHECK_PTR(m_optWidget);
 
     m_optWidget->setCaption(i18n("Similar Selection"));
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h
index d98659d05..d29750408 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h
@@ -61,7 +61,7 @@ public slots:
     virtual void slotSetAction(int);
 
 private:
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
     virtual void buttonPress(KisButtonPressEvent *e);
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
index 539f534a0..95c315d80 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
@@ -41,14 +41,14 @@
 typedef KGenericFactory<SelectSimilar> SelectSimilarFactory;
 K_EXPORT_COMPONENT_FACTORY( chalktoolselectsimilar, SelectSimilarFactory( "chalk" ) )
 
-SelectSimilar::SelectSimilar(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+SelectSimilar::SelectSimilar(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(SelectSimilarFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
         r->add(new KisToolSelectSimilarFactory());
     }
 }
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h
index a0588bfb9..a858b3365 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h
@@ -26,7 +26,7 @@ class SelectSimilar : public KParts::Plugin
         Q_OBJECT
   TQ_OBJECT
     public:
-        SelectSimilar(TQObject *tqparent, const char *name, const TQStringList &);
+        SelectSimilar(TQObject *parent, const char *name, const TQStringList &);
         virtual ~SelectSimilar();
 
 
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc
index 3a804f890..037f6bb52 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.cc
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc
@@ -225,9 +225,9 @@ vKisPoint KisToolStar::starCoordinates(int N, double mx, double my, double x, do
     return starCoordinatesArray;
 }
 
-TQWidget* KisToolStar::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolStar::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
 
     m_optWidget = new WdgToolStar(widget);
     Q_CHECK_PTR(m_optWidget);
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.h b/chalk/plugins/tools/tool_star/kis_tool_star.h
index 3bd8df2ba..947dae25c 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.h
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.h
@@ -46,7 +46,7 @@ public:
 
         virtual void update (KisCanvasSubject *subject);
 
-        virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+        virtual TQWidget* createOptionWidget(TQWidget* parent);
 
         //
         // KisToolPaint interface
diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cc
index e399fafa6..dc40edf9f 100644
--- a/chalk/plugins/tools/tool_star/tool_star.cc
+++ b/chalk/plugins/tools/tool_star/tool_star.cc
@@ -42,14 +42,14 @@ typedef KGenericFactory<ToolStar> ToolStarFactory;
 K_EXPORT_COMPONENT_FACTORY( chalktoolstar, ToolStarFactory( "chalk" ) )
 
 
-ToolStar::ToolStar(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ToolStar::ToolStar(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(ToolStarFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent );
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent );
         r->add(new KisToolStarFactory());
     }
 
diff --git a/chalk/plugins/tools/tool_star/tool_star.h b/chalk/plugins/tools/tool_star/tool_star.h
index 36172dd6c..7ac973a2f 100644
--- a/chalk/plugins/tools/tool_star/tool_star.h
+++ b/chalk/plugins/tools/tool_star/tool_star.h
@@ -31,7 +31,7 @@ class ToolStar : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ToolStar(TQObject *tqparent, const char *name, const TQStringList &);
+    ToolStar(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ToolStar();
 
 private:
diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
index 5b828122c..d6759dca2 100644
--- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
@@ -856,10 +856,10 @@ void KisToolTransform::slotLayerActivated(KisLayerSP)
 }
 
 
-TQWidget* KisToolTransform::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolTransform::createOptionWidget(TQWidget* parent)
 {
 
-    m_optWidget = new WdgToolTransform(tqparent);
+    m_optWidget = new WdgToolTransform(parent);
     Q_CHECK_PTR(m_optWidget);
 
     m_optWidget->cmbFilter->clear();
diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.h b/chalk/plugins/tools/tool_transform/kis_tool_transform.h
index a98cd4f72..70502d605 100644
--- a/chalk/plugins/tools/tool_transform/kis_tool_transform.h
+++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.h
@@ -48,7 +48,7 @@ public:
     KisToolTransform();
     virtual ~KisToolTransform();
 
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
     virtual void setup(KActionCollection *collection);
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cc
index 2ee002ded..b50499f06 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/tool_transform.cc
@@ -42,14 +42,14 @@ typedef KGenericFactory<ToolTransform> ToolTransformFactory;
 K_EXPORT_COMPONENT_FACTORY( chalktooltransform, ToolTransformFactory( "chalk" ) )
 
 
-ToolTransform::ToolTransform(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ToolTransform::ToolTransform(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(ToolTransformFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
         KisToolTransformFactory * f = new KisToolTransformFactory();
         Q_CHECK_PTR(f);
         r->add(f);
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.h b/chalk/plugins/tools/tool_transform/tool_transform.h
index 04bfbaa90..9c4025630 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.h
+++ b/chalk/plugins/tools/tool_transform/tool_transform.h
@@ -31,7 +31,7 @@ class ToolTransform : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ToolTransform(TQObject *tqparent, const char *name, const TQStringList &);
+    ToolTransform(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ToolTransform();
 
 private:
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cc b/chalk/plugins/viewplugins/colorrange/colorrange.cc
index 1bf90bbc9..9a2ab407d 100644
--- a/chalk/plugins/viewplugins/colorrange/colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/colorrange.cc
@@ -50,14 +50,14 @@
 typedef KGenericFactory<ColorRange> ColorRangeFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkcolorrange, ColorRangeFactory( "chalk" ) )
 
-ColorRange::ColorRange(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ColorRange::ColorRange(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
 
-    if (tqparent->inherits("KisView")) {
+    if (parent->inherits("KisView")) {
         setInstance(ColorRangeFactory::instance());
         setXMLFile(locate("data","chalkplugins/colorrange.rc"), true);
-        m_view = dynamic_cast<KisView*>(tqparent);
+        m_view = dynamic_cast<KisView*>(parent);
         m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Color Range..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "colorrange") );
 
     }
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.h b/chalk/plugins/viewplugins/colorrange/colorrange.h
index 38e008d9d..2cedfe7cc 100644
--- a/chalk/plugins/viewplugins/colorrange/colorrange.h
+++ b/chalk/plugins/viewplugins/colorrange/colorrange.h
@@ -30,7 +30,7 @@ class ColorRange : public KParts::Plugin
         Q_OBJECT
   TQ_OBJECT
     public:
-        ColorRange(TQObject *tqparent, const char *name, const TQStringList &);
+        ColorRange(TQObject *parent, const char *name, const TQStringList &);
         virtual ~ColorRange();
     
     private slots:
diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
index 22a82e554..1d2c4d611 100644
--- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
@@ -174,8 +174,8 @@ TQ_UINT32 matchColors(const TQColor & c, enumAction action)
 
 
 
-DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget *  tqparent, const char * name)
-    : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok)
+DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget *  parent, const char * name)
+    : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok)
 {
     m_dev = dev;
     m_view = view;
diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h
index ce39ebd2f..6ee21c7d0 100644
--- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h
+++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h
@@ -51,7 +51,7 @@ enum enumAction {
 
 
  /**
- * This dialog allows the user to create a selection tqmask based
+ * This dialog allows the user to create a selection mask based
  * on a (range of) colors.
  */
 class DlgColorRange: public KDialogBase {
@@ -63,7 +63,7 @@ class DlgColorRange: public KDialogBase {
 
 public:
 
-    DlgColorRange(KisView * view, KisPaintDeviceSP layer, TQWidget * tqparent = 0, const char* name = 0);
+    DlgColorRange(KisView * view, KisPaintDeviceSP layer, TQWidget * parent = 0, const char* name = 0);
     ~DlgColorRange();
 
 private slots:
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
index 10479a3cf..0498505d1 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
@@ -58,13 +58,13 @@ typedef KGenericFactory<ColorSpaceConversion> ColorSpaceConversionFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkcolorspaceconversion, ColorSpaceConversionFactory( "chalk" ) )
 
 
-ColorSpaceConversion::ColorSpaceConversion(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ColorSpaceConversion::ColorSpaceConversion(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
 
-    if ( tqparent->inherits("KisView") )
+    if ( parent->inherits("KisView") )
     {
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
 
         setInstance(ColorSpaceConversionFactory::instance());
         setXMLFile(locate("data","chalkplugins/colorspaceconversion.rc"), true);
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h
index a1f7f5c08..17722871d 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h
@@ -33,7 +33,7 @@ class ColorSpaceConversion : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ColorSpaceConversion(TQObject *tqparent, const char *name, const TQStringList &);
+    ColorSpaceConversion(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ColorSpaceConversion();
     
 private slots:
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
index 616b17149..6f9af1c60 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
@@ -39,9 +39,9 @@
 #include "wdgconvertcolorspace.h"
 #include "dlg_colorspaceconversion.h"
 
-DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget *  tqparent,
+DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget *  parent,
                           const char * name)
-    : super (tqparent, name, true, i18n("Image Size"), Ok | Cancel, Ok)
+    : super (parent, name, true, i18n("Image Size"), Ok | Cancel, Ok)
 {
     m_page = new WdgConvertColorSpace(this, "colorspace_conversion");
     Q_CHECK_PTR(m_page);
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h
index 608989abd..472cbeaf6 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h
+++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h
@@ -36,7 +36,7 @@ class DlgColorSpaceConversion: public KDialogBase {
 
 public:
 
-    DlgColorSpaceConversion(TQWidget * tqparent = 0, const char* name = 0);
+    DlgColorSpaceConversion(TQWidget * parent = 0, const char* name = 0);
     ~DlgColorSpaceConversion();
 
     WdgConvertColorSpace * m_page;
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
index 797fc0983..fedb1fd17 100644
--- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
@@ -39,9 +39,9 @@
 
 DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/,
                           const TQString & /*layerCS*/,
-                          TQWidget *  tqparent,
+                          TQWidget *  parent,
                           const char * name)
-    : super (tqparent, name, true, i18n("Drop Shadow"), Ok | Cancel, Ok)
+    : super (parent, name, true, i18n("Drop Shadow"), Ok | Cancel, Ok)
 {
     m_page = new WdgDropshadow(this, "dropshadow");
     Q_CHECK_PTR(m_page);
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h
index 9f3ca469d..c48a9ea1b 100644
--- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h
+++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h
@@ -37,7 +37,7 @@ class DlgDropshadow: public KDialogBase {
 
 public:
 
-    DlgDropshadow(const TQString & imageCS, const TQString & layerCS, TQWidget * tqparent = 0,
+    DlgDropshadow(const TQString & imageCS, const TQString & layerCS, TQWidget * parent = 0,
              const char* name = 0);
     ~DlgDropshadow();
 
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
index 15e21400f..30339d6e1 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
@@ -122,12 +122,12 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, TQ_INT32
     if (!m_cancelRequested) {
         shadowDev->move (xoffset,yoffset);
 
-        KisGroupLayerSP tqparent = image->rootLayer();
+        KisGroupLayerSP parent = image->rootLayer();
         if (image->activeLayer())
-            tqparent = image->activeLayer()->tqparent().data();
+            parent = image->activeLayer()->parent().data();
 
         KisPaintLayerSP l = new KisPaintLayer(image, i18n("Drop Shadow"), opacity, shadowDev);
-        image->addLayer( l.data(), tqparent, src->siblingBelow() );
+        image->addLayer( l.data(), parent, src->siblingBelow() );
 
         if (allowResize)
         {
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc
index 5dc190f12..f9b5ad26f 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc
@@ -39,15 +39,15 @@
 
 K_EXPORT_COMPONENT_FACTORY( chalkdropshadow, KGenericFactory<KisDropshadowPlugin>( "chalk" ) )
 
-KisDropshadowPlugin::KisDropshadowPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+KisDropshadowPlugin::KisDropshadowPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
-    if ( tqparent->inherits("KisView") ) {
+    if ( parent->inherits("KisView") ) {
 
         setInstance(KGenericFactory<KisDropshadowPlugin>::instance());
         setXMLFile(locate("data","chalkplugins/dropshadow.rc"), true);
 
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
         (void) new KAction(i18n("Add Drop Shadow..."), 0, 0, this, TQT_SLOT(slotDropshadow()), actionCollection(), "dropshadow");
     }
 }
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h
index e2641ed28..5bb92da68 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h
@@ -31,7 +31,7 @@ class KisDropshadowPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisDropshadowPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisDropshadowPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisDropshadowPlugin();
 
 private slots:
diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc
index 8f70b8f71..a23acb6d0 100644
--- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc
+++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc
@@ -48,16 +48,16 @@ namespace FiltersGallery {
 typedef KGenericFactory<ChalkFiltersGallery> ChalkFiltersGalleryFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkfiltersgallery, ChalkFiltersGalleryFactory( "chalk" ) )
 
-ChalkFiltersGallery::ChalkFiltersGallery(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkFiltersGallery::ChalkFiltersGallery(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
 
-    if ( tqparent->inherits("KisView") )
+    if ( parent->inherits("KisView") )
     {
         setInstance(ChalkFiltersGallery::instance());
         setXMLFile(locate("data","chalkplugins/chalkfiltersgallery.rc"), true);
 
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
 
         (void) new KAction(i18n("&Filters Gallery"), 0, 0, this, TQT_SLOT(showFiltersGalleryDialog()), actionCollection(), "chalk_filters_gallery");
 
diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h
index 89fed3862..bfc89f81e 100644
--- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h
+++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h
@@ -34,7 +34,7 @@ namespace FiltersGallery {
         Q_OBJECT
   TQ_OBJECT
         public:
-            ChalkFiltersGallery(TQObject *tqparent, const char *name, const TQStringList &);
+            ChalkFiltersGallery(TQObject *parent, const char *name, const TQStringList &);
             virtual ~ChalkFiltersGallery();
         public slots:
             void showFiltersGalleryDialog();
diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
index 766761779..60313cb22 100644
--- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
+++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
@@ -43,8 +43,8 @@ namespace Plugins {
 namespace FiltersGallery {
 
 
-KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* tqparent,const char *name)
-  : KDialogBase(tqparent,name, true,i18n("Filters Gallery"), Ok | Cancel), m_view(view),m_currentConfigWidget(0), m_currentFilter(0)
+KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const char *name)
+  : KDialogBase(parent,name, true,i18n("Filters Gallery"), Ok | Cancel), m_view(view),m_currentConfigWidget(0), m_currentFilter(0)
 {
    // Initialize main widget
     m_widget = new KisWdgFiltersGallery(this);
diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h
index 09e5cb1fc..406b834d1 100644
--- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h
+++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h
@@ -45,7 +45,7 @@ class KisDlgFiltersGallery : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisDlgFiltersGallery(KisView* view, TQWidget* tqparent,const char *name = "");
+        KisDlgFiltersGallery(KisView* view, TQWidget* parent,const char *name = "");
         ~KisDlgFiltersGallery();
     public:
         inline KisFilter* currentFilter() { return m_currentFilter; };
diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
index 4b781c17a..90acf1309 100644
--- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
+++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
@@ -39,8 +39,8 @@
 #include "kis_histogram_widget.h"
 
 
-DlgHistogram::DlgHistogram( TQWidget *  tqparent, const char * name)
-    : super (tqparent, name, true, i18n("Histogram"), Ok | Cancel, Ok)
+DlgHistogram::DlgHistogram( TQWidget *  parent, const char * name)
+    : super (parent, name, true, i18n("Histogram"), Ok | Cancel, Ok)
 {
     m_page = new KisHistogramWidget(this, "histogram");
     Q_CHECK_PTR(m_page);
diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.h b/chalk/plugins/viewplugins/histogram/dlg_histogram.h
index d2568f7a0..b97bf30f8 100644
--- a/chalk/plugins/viewplugins/histogram/dlg_histogram.h
+++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.h
@@ -39,7 +39,7 @@ class DlgHistogram: public KDialogBase {
 
 public:
 
-    DlgHistogram(TQWidget * tqparent = 0,
+    DlgHistogram(TQWidget * parent = 0,
              const char* name = 0);
     ~DlgHistogram();
 
diff --git a/chalk/plugins/viewplugins/histogram/histogram.cc b/chalk/plugins/viewplugins/histogram/histogram.cc
index 8e6968b90..82d31ec06 100644
--- a/chalk/plugins/viewplugins/histogram/histogram.cc
+++ b/chalk/plugins/viewplugins/histogram/histogram.cc
@@ -52,18 +52,18 @@
 typedef KGenericFactory<Histogram> HistogramFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkhistogram, HistogramFactory( "chalk" ) )
 
-Histogram::Histogram(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+Histogram::Histogram(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
 
-    if ( tqparent->inherits("KisView") ) {
+    if ( parent->inherits("KisView") ) {
 
         setInstance(HistogramFactory::instance());
         setXMLFile(locate("data","chalkplugins/histogram.rc"), true);
 
         m_action = new KAction(i18n("&Histogram"), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "histogram");
 
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
         if (KisImageSP img = m_view->canvasSubject()->currentImg()) {
             connect(img, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQT_SLOT(slotLayersChanged()));
             connect(img, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQT_SLOT(slotLayersChanged()));
diff --git a/chalk/plugins/viewplugins/histogram/histogram.h b/chalk/plugins/viewplugins/histogram/histogram.h
index 2425c0c65..ca32db1a0 100644
--- a/chalk/plugins/viewplugins/histogram/histogram.h
+++ b/chalk/plugins/viewplugins/histogram/histogram.h
@@ -32,7 +32,7 @@ class Histogram : public KParts::Plugin
         Q_OBJECT
   TQ_OBJECT
     public:
-        Histogram(TQObject *tqparent, const char *name, const TQStringList &);
+        Histogram(TQObject *parent, const char *name, const TQStringList &);
         virtual ~Histogram();
     
     private slots:
diff --git a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc
index 12005e05d..c49838706 100644
--- a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc
+++ b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc
@@ -39,8 +39,8 @@
 #include "kis_colorspace.h"
 
 
-KisHistogramWidget::KisHistogramWidget(TQWidget *tqparent, const char *name)
-    : super(tqparent, name)
+KisHistogramWidget::KisHistogramWidget(TQWidget *parent, const char *name)
+    : super(parent, name)
 {
     m_from = 0.0;
     m_width = 0.0;
diff --git a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h
index f83394e7d..53fd174a6 100644
--- a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h
+++ b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h
@@ -33,7 +33,7 @@ class KisHistogramWidget : public WdgHistogram {
   TQ_OBJECT
 
 public:
-    KisHistogramWidget(TQWidget *tqparent, const char *name);
+    KisHistogramWidget(TQWidget *parent, const char *name);
     virtual ~KisHistogramWidget();
 
     void setPaintDevice(KisPaintDeviceSP dev);
diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc
index df5de24ab..9c6795072 100644
--- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc
+++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc
@@ -46,12 +46,12 @@
 typedef KGenericFactory<ChalkHistogramDocker> ChalkHistogramDockerFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkhistogramdocker, ChalkHistogramDockerFactory( "chalk" ) )
 
-ChalkHistogramDocker::ChalkHistogramDocker(TQObject *tqparent, const char *name, const TQStringList&)
-        : KParts::Plugin(tqparent, name)
+ChalkHistogramDocker::ChalkHistogramDocker(TQObject *parent, const char *name, const TQStringList&)
+        : KParts::Plugin(parent, name)
 {
 
-    if ( tqparent->inherits("KisView") ) {
-        m_view = dynamic_cast<KisView*>(tqparent);
+    if ( parent->inherits("KisView") ) {
+        m_view = dynamic_cast<KisView*>(parent);
 
         setInstance(ChalkHistogramDockerFactory::instance());
         setXMLFile(locate("data","chalkplugins/chalkhistogramdocker.rc"), true);
@@ -171,7 +171,7 @@ void ChalkHistogramDocker::colorSpaceChanged(KisColorSpace* cs)
     producerChanged(0);
 }
 
-HistogramDockerUpdater::HistogramDockerUpdater(TQObject* /*tqparent*/, KisHistogramSP h, KisHistogramView* v,
+HistogramDockerUpdater::HistogramDockerUpdater(TQObject* /*parent*/, KisHistogramSP h, KisHistogramView* v,
                                                KisAccumulatingHistogramProducer* p)
     : m_histogram(h), m_view(v), m_producer(p)
 {
diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h
index ade0650fb..ba571a2ab 100644
--- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h
+++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h
@@ -41,7 +41,7 @@ class ChalkHistogramDocker : public KParts::Plugin
 Q_OBJECT
   TQ_OBJECT
 public:
-    ChalkHistogramDocker(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkHistogramDocker(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkHistogramDocker();
 private slots:
     void producerChanged(int pos);
@@ -66,7 +66,7 @@ class HistogramDockerUpdater : public TQObject {
 Q_OBJECT
   TQ_OBJECT
 public:
-    HistogramDockerUpdater(TQObject* tqparent, KisHistogramSP h, KisHistogramView* v,
+    HistogramDockerUpdater(TQObject* parent, KisHistogramSP h, KisHistogramView* v,
                            KisAccumulatingHistogramProducer* p);
 public slots:
     void updated();
diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cc b/chalk/plugins/viewplugins/history_docker/historydocker.cc
index e4f368139..128770065 100644
--- a/chalk/plugins/viewplugins/history_docker/historydocker.cc
+++ b/chalk/plugins/viewplugins/history_docker/historydocker.cc
@@ -37,13 +37,13 @@
 typedef KGenericFactory<ChalkHistoryDocker> ChalkHistoryDockerFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkhistorydocker, ChalkHistoryDockerFactory( "chalk" ) )
 
-ChalkHistoryDocker::ChalkHistoryDocker(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+ChalkHistoryDocker::ChalkHistoryDocker(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     
 
 
-    if ( tqparent->inherits("KisView") )
+    if ( parent->inherits("KisView") )
     {
         setInstance(ChalkHistoryDockerFactory::instance());
         // Create history docker
diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.h b/chalk/plugins/viewplugins/history_docker/historydocker.h
index 82aee9bf1..217b882d3 100644
--- a/chalk/plugins/viewplugins/history_docker/historydocker.h
+++ b/chalk/plugins/viewplugins/history_docker/historydocker.h
@@ -26,7 +26,7 @@
 class ChalkHistoryDocker : public KParts::Plugin
 {
 public:
-    ChalkHistoryDocker(TQObject *tqparent, const char *name, const TQStringList &);
+    ChalkHistoryDocker(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ChalkHistoryDocker();
 };
 
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
index a1eba4f31..8a6567528 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
+++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
@@ -45,9 +45,9 @@ using namespace std;
 
 // XXX: I'm really real bad at arithmetic, let alone math. Here
 // be rounding errors. (Boudewijn)
-DlgImageSize::DlgImageSize( TQWidget *  tqparent,
+DlgImageSize::DlgImageSize( TQWidget *  parent,
                 const char * name)
-    : super (tqparent, name, true, i18n("Image Size"), Ok | Cancel, Ok)
+    : super (parent, name, true, i18n("Image Size"), Ok | Cancel, Ok)
 {
     m_lock = false;
 
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h
index 7983e1120..df643f999 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h
+++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h
@@ -26,7 +26,7 @@ class KisFilterStrategy;
 class WdgImageSize;
 
 /**
- * This dialog allows the user to create a selection tqmask based
+ * This dialog allows the user to create a selection mask based
  * on a (range of) colors.
  */
 class DlgImageSize: public KDialogBase {
@@ -36,7 +36,7 @@ class DlgImageSize: public KDialogBase {
 
 public:
 
-    DlgImageSize(TQWidget * tqparent = 0,
+    DlgImageSize(TQWidget * parent = 0,
              const char* name = 0);
     ~DlgImageSize();
 
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
index 8289d693e..6d24d60ac 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
+++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
@@ -46,9 +46,9 @@ using namespace std;
 
 // XXX: I'm really real bad at arithmetic, let alone math. Here
 // be rounding errors. (Boudewijn)
-DlgLayerSize::DlgLayerSize( TQWidget *  tqparent,
+DlgLayerSize::DlgLayerSize( TQWidget *  parent,
                 const char * name)
-    : super (tqparent, name, true, i18n("Scale Layer"), Ok | Cancel, Ok)
+    : super (parent, name, true, i18n("Scale Layer"), Ok | Cancel, Ok)
 {
     m_lock = false;
 
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.h b/chalk/plugins/viewplugins/imagesize/dlg_layersize.h
index 0aaf84459..2edc45c9f 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.h
+++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.h
@@ -33,7 +33,7 @@ class DlgLayerSize: public KDialogBase {
 
 public:
 
-    DlgLayerSize(TQWidget * tqparent = 0,
+    DlgLayerSize(TQWidget * parent = 0,
              const char* name = 0);
     ~DlgLayerSize();
 
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cc b/chalk/plugins/viewplugins/imagesize/imagesize.cc
index c23d27176..76ac2328c 100644
--- a/chalk/plugins/viewplugins/imagesize/imagesize.cc
+++ b/chalk/plugins/viewplugins/imagesize/imagesize.cc
@@ -58,10 +58,10 @@
 typedef KGenericFactory<ImageSize> ImageSizeFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkimagesize, ImageSizeFactory( "chalk" ) )
 
-ImageSize::ImageSize(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ImageSize::ImageSize(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
-    if ( tqparent->inherits("KisView") )
+    if ( parent->inherits("KisView") )
     {
         setInstance(ImageSizeFactory::instance());
         setXMLFile(locate("data","chalkplugins/imagesize.rc"), true);
@@ -70,7 +70,7 @@ ImageSize::ImageSize(TQObject *tqparent, const char *name, const TQStringList &)
         (void) new KAction(i18n("&Scale Layer..."), 0, 0, this, TQT_SLOT(slotLayerSize()), actionCollection(), "layerscale");
 
 
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
         // Selection manager takes ownership?
         KAction * a = new KAction(i18n("&Scale Selection..."), 0, 0, this, TQT_SLOT(slotSelectionScale()), actionCollection(), "selectionscale");
         Q_CHECK_PTR(a);
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.h b/chalk/plugins/viewplugins/imagesize/imagesize.h
index 989a603f5..9fd9d28ea 100644
--- a/chalk/plugins/viewplugins/imagesize/imagesize.h
+++ b/chalk/plugins/viewplugins/imagesize/imagesize.h
@@ -30,7 +30,7 @@ class ImageSize : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ImageSize(TQObject *tqparent, const char *name, const TQStringList &);
+    ImageSize(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ImageSize();
     
 private slots:
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
index dcda5c7e3..bb21f6f77 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
@@ -39,7 +39,7 @@ using namespace std;
 #include "dlg_border_selection.h"
 #include "wdg_border_selection.h"
 
-DlgBorderSelection::DlgBorderSelection( TQWidget *  tqparent, const char * name) : super (tqparent, name, true, i18n("Border Selection"), Ok | Cancel, Ok)
+DlgBorderSelection::DlgBorderSelection( TQWidget *  parent, const char * name) : super (parent, name, true, i18n("Border Selection"), Ok | Cancel, Ok)
 {
     m_page = new WdgBorderSelection(this, "border_selection");
     Q_CHECK_PTR(m_page);
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h
index 472f01ef3..396b0573b 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h
@@ -31,7 +31,7 @@ class DlgBorderSelection: public KDialogBase {
 
 public:
 
-    DlgBorderSelection(TQWidget * tqparent = 0, const char* name = 0);
+    DlgBorderSelection(TQWidget * parent = 0, const char* name = 0);
     ~DlgBorderSelection();
 
     TQ_INT32 xradius();
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
index b889ccde5..5e327aa8b 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
@@ -39,7 +39,7 @@ using namespace std;
 #include "dlg_grow_selection.h"
 #include "wdg_grow_selection.h"
 
-DlgGrowSelection::DlgGrowSelection( TQWidget *  tqparent, const char * name) : super (tqparent, name, true, i18n("Grow Selection"), Ok | Cancel, Ok)
+DlgGrowSelection::DlgGrowSelection( TQWidget *  parent, const char * name) : super (parent, name, true, i18n("Grow Selection"), Ok | Cancel, Ok)
 {
     m_page = new WdgGrowSelection(this, "grow_selection");
     Q_CHECK_PTR(m_page);
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h
index 61785b20e..0893033d7 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h
@@ -31,7 +31,7 @@ class DlgGrowSelection: public KDialogBase {
 
 public:
 
-    DlgGrowSelection(TQWidget * tqparent = 0, const char* name = 0);
+    DlgGrowSelection(TQWidget * parent = 0, const char* name = 0);
     ~DlgGrowSelection();
 
     TQ_INT32 xradius();
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
index eb50c6cf3..b69b998fa 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
@@ -39,7 +39,7 @@ using namespace std;
 #include "dlg_shrink_selection.h"
 #include "wdg_shrink_selection.h"
 
-DlgShrinkSelection::DlgShrinkSelection( TQWidget *  tqparent, const char * name) : super (tqparent, name, true, i18n("Shrink Selection"), Ok | Cancel, Ok)
+DlgShrinkSelection::DlgShrinkSelection( TQWidget *  parent, const char * name) : super (parent, name, true, i18n("Shrink Selection"), Ok | Cancel, Ok)
 {
     m_page = new WdgShrinkSelection(this, "shrink_selection");
     Q_CHECK_PTR(m_page);
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h
index 53ce386bf..01ea44696 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h
@@ -31,7 +31,7 @@ class DlgShrinkSelection: public KDialogBase {
 
 public:
 
-    DlgShrinkSelection(TQWidget * tqparent = 0, const char* name = 0);
+    DlgShrinkSelection(TQWidget * parent = 0, const char* name = 0);
     ~DlgShrinkSelection();
 
     TQ_INT32 xradius();
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
index 78a757789..46536e4fc 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
@@ -55,15 +55,15 @@
 typedef KGenericFactory<ModifySelection> ModifySelectionFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkmodifyselection, ModifySelectionFactory( "chalk" ) )
 
-ModifySelection::ModifySelection(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ModifySelection::ModifySelection(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
-    if ( tqparent->inherits("KisView") )
+    if ( parent->inherits("KisView") )
     {
         setInstance(ModifySelectionFactory::instance());
         setXMLFile(locate("data","chalkplugins/modify_selection.rc"), true);
 
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
 
         // Selection manager takes ownership?
         KAction* a = new KAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection");
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.h b/chalk/plugins/viewplugins/modify_selection/modify_selection.h
index db5dd1b73..baffc2d45 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.h
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.h
@@ -29,7 +29,7 @@ class ModifySelection : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ModifySelection(TQObject *tqparent, const char *name, const TQStringList &);
+    ModifySelection(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ModifySelection();
     
 private slots:
diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
index 12e3f42cb..dafb66698 100644
--- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
@@ -39,9 +39,9 @@ using namespace std;
 #include "wdg_perftest.h"
 
 
-DlgPerfTest::DlgPerfTest( TQWidget *  tqparent,
+DlgPerfTest::DlgPerfTest( TQWidget *  parent,
                 const char * name)
-    : super (tqparent, name, true, i18n("Performance Test"), Ok | Cancel, Ok)
+    : super (parent, name, true, i18n("Performance Test"), Ok | Cancel, Ok)
 {
     m_lock = false;
 
diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.h b/chalk/plugins/viewplugins/performancetest/dlg_perftest.h
index aae398fa7..3652ebf8a 100644
--- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.h
+++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.h
@@ -31,7 +31,7 @@ class DlgPerfTest: public KDialogBase {
 
 public:
 
-    DlgPerfTest(TQWidget * tqparent = 0,
+    DlgPerfTest(TQWidget * parent = 0,
              const char* name = 0);
     ~DlgPerfTest();
 
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc
index 88a50e853..8a137374a 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cc
@@ -78,17 +78,17 @@
 typedef KGenericFactory<PerfTest> PerfTestFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkperftest, PerfTestFactory( "chalk" ) )
 
-PerfTest::PerfTest(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+PerfTest::PerfTest(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
-    if ( tqparent->inherits("KisView") )
+    if ( parent->inherits("KisView") )
     {
         setInstance(PerfTestFactory::instance());
         setXMLFile(locate("data","chalkplugins/perftest.rc"), true);
 
         (void) new KAction(i18n("&Performance Test..."), 0, 0, this, TQT_SLOT(slotPerfTest()), actionCollection(), "perf_test");
 
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
     }
 }
 
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h
index 5bae3c8cd..cbd8799fb 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.h
+++ b/chalk/plugins/viewplugins/performancetest/perftest.h
@@ -33,7 +33,7 @@ class PerfTest : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    PerfTest(TQObject *tqparent, const char *name, const TQStringList &);
+    PerfTest(TQObject *parent, const char *name, const TQStringList &);
     virtual ~PerfTest();
     
 private slots:
diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
index 6e3cc9f74..03bd6b52c 100644
--- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
+++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
@@ -39,9 +39,9 @@ using namespace std;
 #include "wdg_rotateimage.h"
 
 
-DlgRotateImage::DlgRotateImage( TQWidget *  tqparent,
+DlgRotateImage::DlgRotateImage( TQWidget *  parent,
                 const char * name)
-    : super (tqparent, name, true, i18n("Rotate Image"), Ok | Cancel, Ok)
+    : super (parent, name, true, i18n("Rotate Image"), Ok | Cancel, Ok)
 {
     m_lock = false;
 
diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h
index 47ddd344c..7e3a9365d 100644
--- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h
+++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h
@@ -39,7 +39,7 @@ class DlgRotateImage: public KDialogBase {
 
 public:
 
-    DlgRotateImage(TQWidget * tqparent = 0,
+    DlgRotateImage(TQWidget * parent = 0,
              const char* name = 0);
     ~DlgRotateImage();
 
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
index e8961cec1..60d6f254e 100644
--- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
+++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
@@ -51,14 +51,14 @@ typedef KGenericFactory<RotateImage> RotateImageFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkrotateimage, RotateImageFactory( "chalk" ) )
 
 // XXX: this plugin could also provide layer scaling/resizing
-RotateImage::RotateImage(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+RotateImage::RotateImage(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
 
-    if ( tqparent->inherits("KisView") ) {
+    if ( parent->inherits("KisView") ) {
         setInstance(RotateImageFactory::instance());
         setXMLFile(locate("data","chalkplugins/rotateimage.rc"), true);
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
         (void) new KAction(i18n("&Rotate Image..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage");
         (void) new KAction(i18n("Rotate Image CW"), "rotate_cw", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90");
         (void) new KAction(i18n("Rotate Image 1&80"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180");
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.h b/chalk/plugins/viewplugins/rotateimage/rotateimage.h
index 6b262608c..79c03c085 100644
--- a/chalk/plugins/viewplugins/rotateimage/rotateimage.h
+++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.h
@@ -29,7 +29,7 @@ class RotateImage : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    RotateImage(TQObject *tqparent, const char *name, const TQStringList &);
+    RotateImage(TQObject *parent, const char *name, const TQStringList &);
     virtual ~RotateImage();
 
 private slots:
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index dad0ee01f..6e942c389 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -58,8 +58,8 @@
 
 #include <kglobal.h>
 
-KSnapshot::KSnapshot(TQWidget *tqparent, const char *name)
-    : super(tqparent, name, false, TQString(), Ok|Cancel)
+KSnapshot::KSnapshot(TQWidget *parent, const char *name)
+    : super(parent, name, false, TQString(), Ok|Cancel)
 {
     grabber = new TQWidget( 0, 0, WStyle_Customize | WX11BypassWM );
     Q_CHECK_PTR(grabber);
@@ -319,11 +319,11 @@ Window findRealWindow( Window w, int depth = 0 )
         if( type != None )
             return w;
     }
-    Window root, tqparent;
+    Window root, parent;
     Window* tqchildren;
     unsigned int ntqchildren;
     Window ret = None;
-    if( XQueryTree( qt_xdisplay(), w, &root, &tqparent, &tqchildren, &ntqchildren ) != 0 ) {
+    if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) {
         for( unsigned int i = 0;
              i < ntqchildren && ret == None;
              ++i )
@@ -343,11 +343,11 @@ void KSnapshot::performGrab()
     if ( mainWidget->mode() == WindowUnderCursor ) {
         Window root;
         Window child;
-        uint tqmask;
+        uint mask;
         int rootX, rootY, winX, winY;
         XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child,
                    &rootX, &rootY, &winX, &winY,
-                   &tqmask);
+                   &mask);
         if( child == None )
             child = qt_xrootwin();
         if( !mainWidget->includeDecorations()) {
@@ -364,16 +364,16 @@ void KSnapshot::performGrab()
         w += 2 * border;
         h += 2 * border;
 
-        Window tqparent;
+        Window parent;
         Window* tqchildren;
         unsigned int ntqchildren;
-        if( XQueryTree( qt_xdisplay(), child, &root, &tqparent,
+        if( XQueryTree( qt_xdisplay(), child, &root, &parent,
                 &tqchildren, &ntqchildren ) != 0 ) {
             if( tqchildren != NULL )
                 XFree( tqchildren );
             int newx, newy;
             Window dummy;
-            if( XTranslateCoordinates( qt_xdisplay(), tqparent, qt_xrootwin(),
+            if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(),
                            x, y, &newx, &newy, &dummy )) {
                 x = newx;
                 y = newy;
@@ -385,8 +385,8 @@ void KSnapshot::performGrab()
 #ifdef HAVE_X11_EXTENSIONS_SHAPE_H
         //No XShape - no work.
         if (haveXShape) {
-            TQBitmap tqmask(w, h);
-            //As the first step, get the tqmask from XShape.
+            TQBitmap mask(w, h);
+            //As the first step, get the mask from XShape.
             int count, order;
             XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child,
                                  ShapeBounding, &count, &order);
@@ -395,7 +395,7 @@ void KSnapshot::performGrab()
             //Since the border area is part of the window, we use bounding
             // to limit our work region
             if (rects) {
-                //Create a TQRegion from the rectangles describing the bounding tqmask.
+                //Create a TQRegion from the rectangles describing the bounding mask.
                 TQRegion contents;
                 for (int pos = 0; pos < count; pos++)
                     contents += TQRegion(rects[pos].x, rects[pos].y,
@@ -417,14 +417,14 @@ void KSnapshot::performGrab()
                 TQRegion maskedAway = bbox - contents;
                 TQMemArray<TQRect> maskedAwayRects = maskedAway.rects();
 
-                //Construct a bitmap tqmask from the rectangles
-                TQPainter p(&tqmask);
+                //Construct a bitmap mask from the rectangles
+                TQPainter p(&mask);
                 p.fillRect(0, 0, w, h, TQt::color1);
                 for (uint pos = 0; pos < maskedAwayRects.count(); pos++)
                     p.fillRect(maskedAwayRects[pos], TQt::color0);
                 p.end();
 
-                snapshot.setMask(tqmask);
+                snapshot.setMask(mask);
             }
         }
 #endif
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h
index 030cad127..eb8fa60a1 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h
@@ -41,8 +41,8 @@ class KSnapshotThumb : public TQLabel
   TQ_OBJECT
 
 public:
-    KSnapshotThumb(TQWidget *tqparent, const char *name = 0)
-        : TQLabel(tqparent, name)
+    KSnapshotThumb(TQWidget *parent, const char *name = 0)
+        : TQLabel(parent, name)
         {
             tqsetAlignment(AlignHCenter | AlignVCenter);
         }
@@ -82,7 +82,7 @@ class KSnapshot : public KDialogBase
   TQ_OBJECT
 
 public:
-    KSnapshot(TQWidget *tqparent= 0, const char *name= 0);
+    KSnapshot(TQWidget *parent= 0, const char *name= 0);
     ~KSnapshot();
 
     enum CaptureMode { FullScreen=0, WindowUnderCursor=1, Region=2 };
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index f4511554a..ec5ba7cc0 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -28,8 +28,8 @@
 
 #include <kglobalsettings.h>
 
-SizeTip::SizeTip( TQWidget *tqparent, const char *name )
-    : TQLabel( tqparent, name, WStyle_Customize | WX11BypassWM |
+SizeTip::SizeTip( TQWidget *parent, const char *name )
+    : TQLabel( parent, name, WStyle_Customize | WX11BypassWM |
       WStyle_StaysOnTop | WStyle_NoBorder | WStyle_Tool )
 {
   setMargin( 2 );
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.h b/chalk/plugins/viewplugins/screenshot/regiongrabber.h
index b1da10498..13b35dcf3 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.h
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.h
@@ -29,7 +29,7 @@ class TQTimer;
 class SizeTip : public TQLabel
 {
 public:
-    SizeTip( TQWidget *tqparent, const char *name=0 );
+    SizeTip( TQWidget *parent, const char *name=0 );
     ~SizeTip() {}
 
     void setTip( const TQRect &rect );
diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
index ff7629253..4af58e3d9 100644
--- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
@@ -41,8 +41,8 @@
 
 K_EXPORT_COMPONENT_FACTORY( chalkscreenshot, KGenericFactory<Screenshot>( "chalk" ) )
 
-Screenshot::Screenshot(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+Screenshot::Screenshot(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     KGlobal::locale()->insertCatalogue("kscreenshot_plugin");
     setInstance(KGenericFactory<Screenshot>::instance());
@@ -72,7 +72,7 @@ void Screenshot::slotScreenGrabbed()
     KTempFile temp(locateLocal("tmp", "screenshot"), ".png");
     snapshot->save(temp.name());
 
-    KisView *view = dynamic_cast<KisView *>(tqparent());
+    KisView *view = dynamic_cast<KisView *>(parent());
     if(view)
         view->importImage(temp.name());
 }
diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.h b/chalk/plugins/viewplugins/screenshot/screenshot.h
index d1100836a..055bdb3b9 100644
--- a/chalk/plugins/viewplugins/screenshot/screenshot.h
+++ b/chalk/plugins/viewplugins/screenshot/screenshot.h
@@ -29,7 +29,7 @@ class Screenshot : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    Screenshot(TQObject *tqparent, const char *name, const TQStringList &);
+    Screenshot(TQObject *parent, const char *name, const TQStringList &);
     virtual ~Screenshot();
 
 private slots:
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc
index 34b4d1d83..31e9897aa 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cc
+++ b/chalk/plugins/viewplugins/scripting/scripting.cc
@@ -54,16 +54,16 @@
 typedef KGenericFactory<Scripting> ChalkScriptingFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkscripting, ChalkScriptingFactory( "chalk" ) )
 
-Scripting::Scripting(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(ChalkScriptingFactory::instance());
 
 
-    if ( tqparent->inherits("KisView") )
+    if ( parent->inherits("KisView") )
     {
         setInstance(Scripting::instance());
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
         m_scriptguiclient = new Kross::Api::ScriptGUIClient( m_view, m_view );
 //         m_scriptguiclient ->setXMLFile(locate("data","chalkplugins/scripting.rc"), true);
         //BEGIN TODO: understand why the ScriptGUIClient doesn't "link" its actions to the menu
diff --git a/chalk/plugins/viewplugins/scripting/scripting.h b/chalk/plugins/viewplugins/scripting/scripting.h
index a981175de..2cba6abb3 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.h
+++ b/chalk/plugins/viewplugins/scripting/scripting.h
@@ -39,7 +39,7 @@ class Scripting : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
     public:
-        Scripting(TQObject *tqparent, const char *name, const TQStringList &);
+        Scripting(TQObject *parent, const char *name, const TQStringList &);
         virtual ~Scripting();
     private slots:
         void executionFinished(const Kross::Api::ScriptAction*);
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
index a5717a973..b7703846d 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
@@ -53,14 +53,14 @@
 typedef KGenericFactory<SelectOpaque> SelectOpaqueFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkselectopaque, SelectOpaqueFactory( "chalk" ) )
 
-SelectOpaque::SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
 
-    if (tqparent->inherits("KisView")) {
+    if (parent->inherits("KisView")) {
         setInstance(SelectOpaqueFactory::instance());
         setXMLFile(locate("data","chalkplugins/selectopaque.rc"), true);
-        m_view = dynamic_cast<KisView*>(tqparent);
+        m_view = dynamic_cast<KisView*>(parent);
         m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "selectopaque") );
 
     }
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.h b/chalk/plugins/viewplugins/selectopaque/selectopaque.h
index 47614e302..b77c352a7 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.h
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.h
@@ -30,7 +30,7 @@ class SelectOpaque : public KParts::Plugin
         Q_OBJECT
   TQ_OBJECT
     public:
-        SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &);
+        SelectOpaque(TQObject *parent, const char *name, const TQStringList &);
         virtual ~SelectOpaque();
     
     private slots:
diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
index e6124046f..99078d0f2 100644
--- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
+++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
@@ -34,9 +34,9 @@
 
 DlgSeparate::DlgSeparate( const TQString & imageCS,
                           const TQString & layerCS,
-                          TQWidget *  tqparent,
+                          TQWidget *  parent,
                           const char * name)
-    : super (tqparent, name, true, i18n("Separate Image"), Ok | Cancel, Ok),
+    : super (parent, name, true, i18n("Separate Image"), Ok | Cancel, Ok),
       m_imageCS(imageCS),
       m_layerCS(layerCS)
 {
diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.h b/chalk/plugins/viewplugins/separate_channels/dlg_separate.h
index d3536ddaa..4d97925c6 100644
--- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.h
+++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.h
@@ -36,7 +36,7 @@ class DlgSeparate: public KDialogBase {
 
 public:
 
-    DlgSeparate(const TQString & imageCS, const TQString & layerCS, TQWidget * tqparent = 0,
+    DlgSeparate(const TQString & imageCS, const TQString & layerCS, TQWidget * parent = 0,
              const char* name = 0);
     ~DlgSeparate();
 
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc
index 64a83db58..f56b40a2d 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc
+++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc
@@ -39,14 +39,14 @@
 
 K_EXPORT_COMPONENT_FACTORY( chalkseparatechannels, KGenericFactory<KisSeparateChannelsPlugin>( "chalk" ) )
 
-KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
 
-    if ( tqparent->inherits("KisView") ) {
+    if ( parent->inherits("KisView") ) {
         setInstance(KGenericFactory<KisSeparateChannelsPlugin>::instance());
         setXMLFile(locate("data","chalkplugins/imageseparate.rc"), true);
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
         (void) new KAction(i18n("Separate Image..."), 0, 0, this, TQT_SLOT(slotSeparate()), actionCollection(), "separate");
     }
 }
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h
index ce3aa7318..6f3c1579b 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h
+++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h
@@ -31,7 +31,7 @@ class KisSeparateChannelsPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisSeparateChannelsPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    KisSeparateChannelsPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KisSeparateChannelsPlugin();
 
 private slots:
diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
index ff6dadde8..a2c43aa91 100644
--- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
+++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
@@ -39,9 +39,9 @@ using namespace std;
 #include "wdg_shearimage.h"
 
 
-DlgShearImage::DlgShearImage( TQWidget *  tqparent,
+DlgShearImage::DlgShearImage( TQWidget *  parent,
                 const char * name)
-    : super (tqparent, name, true, i18n("Shear Image"), Ok | Cancel, Ok)
+    : super (parent, name, true, i18n("Shear Image"), Ok | Cancel, Ok)
 {
     m_lock = false;
 
diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h
index 5c82abc72..f4a5dd8a2 100644
--- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h
+++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h
@@ -31,7 +31,7 @@ class DlgShearImage: public KDialogBase {
 
 public:
 
-    DlgShearImage(TQWidget * tqparent = 0,
+    DlgShearImage(TQWidget * parent = 0,
              const char* name = 0);
     ~DlgShearImage();
 
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cc b/chalk/plugins/viewplugins/shearimage/shearimage.cc
index 4e7e61d6a..7976c266e 100644
--- a/chalk/plugins/viewplugins/shearimage/shearimage.cc
+++ b/chalk/plugins/viewplugins/shearimage/shearimage.cc
@@ -51,10 +51,10 @@ typedef KGenericFactory<ShearImage> ShearImageFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkshearimage, ShearImageFactory( "chalk" ) )
 
 // XXX: this plugin could also provide layer scaling/resizing
-ShearImage::ShearImage(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ShearImage::ShearImage(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
-    if ( tqparent->inherits("KisView") )
+    if ( parent->inherits("KisView") )
     {
         setInstance(ShearImageFactory::instance());
         setXMLFile(locate("data","chalkplugins/shearimage.rc"), true);
@@ -62,7 +62,7 @@ ShearImage::ShearImage(TQObject *tqparent, const char *name, const TQStringList
         (void) new KAction(i18n("&Shear Image..."), 0, 0, this, TQT_SLOT(slotShearImage()), actionCollection(), "shearimage");
         (void) new KAction(i18n("&Shear Layer..."), 0, 0, this, TQT_SLOT(slotShearLayer()), actionCollection(), "shearlayer");
 
-        m_view = (KisView*) tqparent;
+        m_view = (KisView*) parent;
     }
 }
 
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.h b/chalk/plugins/viewplugins/shearimage/shearimage.h
index c824fb51f..9b7e95fa7 100644
--- a/chalk/plugins/viewplugins/shearimage/shearimage.h
+++ b/chalk/plugins/viewplugins/shearimage/shearimage.h
@@ -29,7 +29,7 @@ class ShearImage : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ShearImage(TQObject *tqparent, const char *name, const TQStringList &);
+    ShearImage(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ShearImage();
 
 private slots:
diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc b/chalk/plugins/viewplugins/substrate/dlg_substrate.cc
index dcecce482..b0a898568 100644
--- a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc
+++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.cc
@@ -24,9 +24,9 @@
 #include "wdgsubstrate.h"
 
 
-DlgSubstrate::DlgSubstrate( TQWidget *  tqparent,
+DlgSubstrate::DlgSubstrate( TQWidget *  parent,
                     const char * name)
-    : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok)
+    : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok)
 {
     m_previewPix = TQPixmap();
     m_page = new WdgSubstrate(this, "substrate");
diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.h b/chalk/plugins/viewplugins/substrate/dlg_substrate.h
index 82051ad36..ac494ba2b 100644
--- a/chalk/plugins/viewplugins/substrate/dlg_substrate.h
+++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.h
@@ -40,7 +40,7 @@ class DlgSubstrate: public KDialogBase {
 
 public:
 
-    DlgSubstrate(TQWidget * tqparent = 0,
+    DlgSubstrate(TQWidget * parent = 0,
               const char* name = 0);
     ~DlgSubstrate();
 
diff --git a/chalk/plugins/viewplugins/substrate/substrate.cc b/chalk/plugins/viewplugins/substrate/substrate.cc
index 8aa4d32ea..2e080df70 100644
--- a/chalk/plugins/viewplugins/substrate/substrate.cc
+++ b/chalk/plugins/viewplugins/substrate/substrate.cc
@@ -44,18 +44,18 @@
 typedef KGenericFactory<SubstratePlugin> SubstrateFactory;
 K_EXPORT_COMPONENT_FACTORY( chalksubstrate, SubstrateFactory( "chalk" ) )
 
-SubstratePlugin::SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+SubstratePlugin::SubstratePlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
 
-    if ( tqparent->inherits("KisView") )
+    if ( parent->inherits("KisView") )
     {
         setInstance(SubstrateFactory::instance());
         setXMLFile(locate("data","chalkplugins/substrate.rc"), true);
 
         (void) new KAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate");
 
-         m_view = (KisView*) tqparent;
+         m_view = (KisView*) parent;
     }
 }
 
diff --git a/chalk/plugins/viewplugins/substrate/substrate.h b/chalk/plugins/viewplugins/substrate/substrate.h
index 409a00f3b..243830452 100644
--- a/chalk/plugins/viewplugins/substrate/substrate.h
+++ b/chalk/plugins/viewplugins/substrate/substrate.h
@@ -30,7 +30,7 @@ class SubstratePlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    SubstratePlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~SubstratePlugin();
     
 private slots:
diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.cc b/chalk/plugins/viewplugins/variations/dlg_variations.cc
index 133246231..4f1890248 100644
--- a/chalk/plugins/viewplugins/variations/dlg_variations.cc
+++ b/chalk/plugins/viewplugins/variations/dlg_variations.cc
@@ -24,9 +24,9 @@
 #include "wdg_variations.h"
 
 
-DlgVariations::DlgVariations( TQWidget *  tqparent,
+DlgVariations::DlgVariations( TQWidget *  parent,
                     const char * name)
-    : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok)
+    : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok)
 {
     m_previewPix = TQPixmap();
     m_page = new WdgVariations(this, "variations");
diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.h b/chalk/plugins/viewplugins/variations/dlg_variations.h
index e160e6aab..31909fca3 100644
--- a/chalk/plugins/viewplugins/variations/dlg_variations.h
+++ b/chalk/plugins/viewplugins/variations/dlg_variations.h
@@ -40,7 +40,7 @@ class DlgVariations: public KDialogBase {
 
 public:
 
-    DlgVariations(TQWidget * tqparent = 0,
+    DlgVariations(TQWidget * parent = 0,
               const char* name = 0);
     ~DlgVariations();
 
diff --git a/chalk/plugins/viewplugins/variations/variations.cc b/chalk/plugins/viewplugins/variations/variations.cc
index 40e8fcf8d..2c0aaa9d2 100644
--- a/chalk/plugins/viewplugins/variations/variations.cc
+++ b/chalk/plugins/viewplugins/variations/variations.cc
@@ -48,18 +48,18 @@
 typedef KGenericFactory<Variations> VariationsFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkvariations, VariationsFactory( "chalk" ) )
 
-Variations::Variations(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+Variations::Variations(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
 
-    if ( tqparent->inherits("KisView") )
+    if ( parent->inherits("KisView") )
     {
         setInstance(VariationsFactory::instance());
         setXMLFile(locate("data","chalkplugins/variations.rc"), true);
 
         (void) new KAction(i18n("&Variations..."), 0, 0, this, TQT_SLOT(slotVariationsActivated()), actionCollection(), "variations");
 
-         m_view = (KisView*) tqparent;
+         m_view = (KisView*) parent;
     }
 }
 
diff --git a/chalk/plugins/viewplugins/variations/variations.h b/chalk/plugins/viewplugins/variations/variations.h
index d8680ba79..1b448a423 100644
--- a/chalk/plugins/viewplugins/variations/variations.h
+++ b/chalk/plugins/viewplugins/variations/variations.h
@@ -30,7 +30,7 @@ class Variations : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-        Variations(TQObject *tqparent, const char *name, const TQStringList &);
+        Variations(TQObject *parent, const char *name, const TQStringList &);
     virtual ~Variations();
     
 private slots:
diff --git a/chalk/sdk/kis_progress_subject.h b/chalk/sdk/kis_progress_subject.h
index 59a8acb1e..024f77468 100644
--- a/chalk/sdk/kis_progress_subject.h
+++ b/chalk/sdk/kis_progress_subject.h
@@ -28,7 +28,7 @@ class KRITAUI_EXPORT KisProgressSubject : public TQObject {
 
 protected:
     KisProgressSubject() {};
-    KisProgressSubject(TQObject * tqparent, const char * name) : TQObject(tqparent, name) {};
+    KisProgressSubject(TQObject * parent, const char * name) : TQObject(parent, name) {};
     virtual ~KisProgressSubject();
 
 public:
diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc
index 846139746..c7f9e0ad8 100644
--- a/chalk/ui/kcurve.cc
+++ b/chalk/ui/kcurve.cc
@@ -42,8 +42,8 @@
 
 #include "kcurve.h"
 
-KCurve::KCurve(TQWidget *tqparent, const char *name, WFlags f)
-            : TQWidget(tqparent, name, f)
+KCurve::KCurve(TQWidget *parent, const char *name, WFlags f)
+            : TQWidget(parent, name, f)
 {
     m_grab_point     = NULL;
     m_readOnlyMode   = false;
diff --git a/chalk/ui/kcurve.h b/chalk/ui/kcurve.h
index 820b5f5ad..20aa20c3e 100644
--- a/chalk/ui/kcurve.h
+++ b/chalk/ui/kcurve.h
@@ -32,7 +32,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    KCurve(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0);
+    KCurve(TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
 
     virtual ~KCurve();
 
diff --git a/chalk/ui/kis_autobrush.cc b/chalk/ui/kis_autobrush.cc
index 3d081188f..b2e848a84 100644
--- a/chalk/ui/kis_autobrush.cc
+++ b/chalk/ui/kis_autobrush.cc
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 
 
-KisAutobrush::KisAutobrush(TQWidget *tqparent, const char* name, const TQString& caption) : KisWdgAutobrush(tqparent, name)
+KisAutobrush::KisAutobrush(TQWidget *parent, const char* name, const TQString& caption) : KisWdgAutobrush(parent, name)
 {
     setCaption(caption);
 
diff --git a/chalk/ui/kis_autobrush.h b/chalk/ui/kis_autobrush.h
index 92b8509d8..fb06393ed 100644
--- a/chalk/ui/kis_autobrush.h
+++ b/chalk/ui/kis_autobrush.h
@@ -28,7 +28,7 @@ class KisAutobrush : public KisWdgAutobrush
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisAutobrush(TQWidget *tqparent, const char* name, const TQString& caption);
+    KisAutobrush(TQWidget *parent, const char* name, const TQString& caption);
     void activate();
 
 signals:
diff --git a/chalk/ui/kis_autogradient.cc b/chalk/ui/kis_autogradient.cc
index 86b755f91..318bf3055 100644
--- a/chalk/ui/kis_autogradient.cc
+++ b/chalk/ui/kis_autogradient.cc
@@ -32,7 +32,7 @@
 
 /****************************** KisAutogradient ******************************/
 
-KisAutogradient::KisAutogradient(TQWidget *tqparent, const char* name, const TQString& caption) : KisWdgAutogradient(tqparent, name)
+KisAutogradient::KisAutogradient(TQWidget *parent, const char* name, const TQString& caption) : KisWdgAutogradient(parent, name)
 {
     setCaption(caption);
     m_autogradientResource = new KisAutogradientResource();
diff --git a/chalk/ui/kis_autogradient.h b/chalk/ui/kis_autogradient.h
index 7399aa67f..19c832a9e 100644
--- a/chalk/ui/kis_autogradient.h
+++ b/chalk/ui/kis_autogradient.h
@@ -32,7 +32,7 @@ class KisAutogradient : public KisWdgAutogradient
   TQ_OBJECT
 
     public:
-        KisAutogradient(TQWidget *tqparent, const char* name, const TQString& caption);
+        KisAutogradient(TQWidget *parent, const char* name, const TQString& caption);
         void activate();
     signals:
         void activatedResource(KisResource *r);
diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc
index 1484563fc..0bc9ae087 100644
--- a/chalk/ui/kis_birdeye_box.cc
+++ b/chalk/ui/kis_birdeye_box.cc
@@ -177,8 +177,8 @@ namespace {
 
 }
 
-KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* tqparent, const char* name)
-    : TQWidget(tqparent, name)
+KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name)
+    : TQWidget(parent, name)
         , m_view(view)
         , m_subject(view->canvasSubject())
 {
diff --git a/chalk/ui/kis_birdeye_box.h b/chalk/ui/kis_birdeye_box.h
index b95504748..e8fb88f71 100644
--- a/chalk/ui/kis_birdeye_box.h
+++ b/chalk/ui/kis_birdeye_box.h
@@ -38,7 +38,7 @@ class KisBirdEyeBox : public TQWidget
 
 public:
 
-    KisBirdEyeBox(KisView * view, TQWidget * tqparent = 0, const char* name=0);
+    KisBirdEyeBox(KisView * view, TQWidget * parent = 0, const char* name=0);
     ~KisBirdEyeBox();
 
     void setImage(KisImageSP image);
diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc
index 69aeafdfa..20de3c5b7 100644
--- a/chalk/ui/kis_brush_chooser.cc
+++ b/chalk/ui/kis_brush_chooser.cc
@@ -27,8 +27,8 @@
 #include "kis_icon_item.h"
 #include "kis_brush.h"
 
-KisBrushChooser::KisBrushChooser(TQWidget *tqparent, const char *name)
-    : super(tqparent, name)
+KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name)
+    : super(parent, name)
 {
     m_lbSpacing = new TQLabel(i18n("Spacing:"), this);
     m_slSpacing = new KisDoubleWidget(0.0, 10, this, "double_widget");
@@ -36,7 +36,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *tqparent, const char *name)
     m_slSpacing->setTickInterval(1);
     TQObject::connect(m_slSpacing, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotSetItemSpacing(double)));
 
-    m_chkColorMask = new TQCheckBox(i18n("Use color as tqmask"), this);
+    m_chkColorMask = new TQCheckBox(i18n("Use color as mask"), this);
     TQObject::connect(m_chkColorMask, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetItemUseColorAsMask(bool)));
 
     m_lbName = new TQLabel(this);
diff --git a/chalk/ui/kis_brush_chooser.h b/chalk/ui/kis_brush_chooser.h
index 99438e70a..cd5509ada 100644
--- a/chalk/ui/kis_brush_chooser.h
+++ b/chalk/ui/kis_brush_chooser.h
@@ -31,7 +31,7 @@ class KisBrushChooser : public KisItemChooser {
   TQ_OBJECT
 
 public:
-    KisBrushChooser(TQWidget *tqparent = 0, const char *name = 0);
+    KisBrushChooser(TQWidget *parent = 0, const char *name = 0);
     virtual ~KisBrushChooser();
 
 protected:
diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc
index 8ad09df3d..168724186 100644
--- a/chalk/ui/kis_canvas.cc
+++ b/chalk/ui/kis_canvas.cc
@@ -1064,9 +1064,9 @@ KisInputDevice KisCanvasWidget::findActiveInputDevice()
 #define TQPAINTDEVICE_CANVAS_WIDGET false
 #define OPENGL_CANVAS_WIDGET true
 
-KisCanvas::KisCanvas(TQWidget *tqparent, const char *name)
+KisCanvas::KisCanvas(TQWidget *parent, const char *name)
 {
-    m_parent = tqparent;
+    m_parent = parent;
     m_name = name;
     m_enableMoveEventCompressionHint = false;
     m_canvasWidget = 0;
diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h
index be698ae2d..4d92a4ce9 100644
--- a/chalk/ui/kis_canvas.h
+++ b/chalk/ui/kis_canvas.h
@@ -286,7 +286,7 @@ class KisCanvas : public TQObject {
   TQ_OBJECT
 
 public:
-    KisCanvas(TQWidget *tqparent, const char *name);
+    KisCanvas(TQWidget *parent, const char *name);
     virtual ~KisCanvas();
     
     // When enabled, the canvas may throw away move events if the application
diff --git a/chalk/ui/kis_cmb_composite.cc b/chalk/ui/kis_cmb_composite.cc
index 754e69daf..516813510 100644
--- a/chalk/ui/kis_cmb_composite.cc
+++ b/chalk/ui/kis_cmb_composite.cc
@@ -25,8 +25,8 @@
 
 #include "kis_cmb_composite.h"
 
-KisCmbComposite::KisCmbComposite(TQWidget * tqparent, const char * name)
-    : super( false, tqparent, name )
+KisCmbComposite::KisCmbComposite(TQWidget * parent, const char * name)
+    : super( false, parent, name )
 {
     connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpActivated(int)));
     connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotOpHighlighted(int)));
diff --git a/chalk/ui/kis_cmb_composite.h b/chalk/ui/kis_cmb_composite.h
index ef5df0e61..25ccf3678 100644
--- a/chalk/ui/kis_cmb_composite.h
+++ b/chalk/ui/kis_cmb_composite.h
@@ -45,7 +45,7 @@ class KRITAUI_EXPORT KisCmbComposite : public TQComboBox
 
  public:
 
-    KisCmbComposite(TQWidget * tqparent = 0, const char * name = 0 );
+    KisCmbComposite(TQWidget * parent = 0, const char * name = 0 );
     virtual ~KisCmbComposite();
 
     KisCompositeOp currentItem() const;
diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cc
index 0936350e3..2d7e80d9d 100644
--- a/chalk/ui/kis_cmb_idlist.cc
+++ b/chalk/ui/kis_cmb_idlist.cc
@@ -26,8 +26,8 @@
 #include "kis_id.h"
 #include "kis_cmb_idlist.h"
 
-KisCmbIDList::KisCmbIDList(TQWidget * tqparent, const char * name)
-    : super( false, tqparent, name )
+KisCmbIDList::KisCmbIDList(TQWidget * parent, const char * name)
+    : super( false, parent, name )
 {
     connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotIDActivated(int)));
     connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotIDHighlighted(int)));
diff --git a/chalk/ui/kis_cmb_idlist.h b/chalk/ui/kis_cmb_idlist.h
index 2665c8f83..068943098 100644
--- a/chalk/ui/kis_cmb_idlist.h
+++ b/chalk/ui/kis_cmb_idlist.h
@@ -39,7 +39,7 @@ class KisCmbIDList : public TQComboBox
 
 public:
 
-    KisCmbIDList(TQWidget * tqparent = 0, const char * name = 0 );
+    KisCmbIDList(TQWidget * parent = 0, const char * name = 0 );
     virtual ~KisCmbIDList();
 
 
diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc
index 44a9699b5..4d2103d81 100644
--- a/chalk/ui/kis_color_cup.cc
+++ b/chalk/ui/kis_color_cup.cc
@@ -43,8 +43,8 @@
 #include <kis_color.h>
 #include <kis_color_cup.h>
 
-KisColorPopup::KisColorPopup(TQColor c, TQWidget * tqparent, const char * name)
-    : TQFrame(tqparent, name, WType_Popup | WStyle_Customize | WStyle_NoBorder)
+KisColorPopup::KisColorPopup(TQColor c, TQWidget * parent, const char * name)
+    : TQFrame(parent, name, WType_Popup | WStyle_Customize | WStyle_NoBorder)
 {
     m_color = c;
     setMargin(4);
@@ -59,8 +59,8 @@ KisColorPopup::KisColorPopup(TQColor c, TQWidget * tqparent, const char * name)
 
 }
 
-KisColorCup::KisColorCup(TQWidget * tqparent, const char * name)
-    : TQPushButton(tqparent, name)
+KisColorCup::KisColorCup(TQWidget * parent, const char * name)
+    : TQPushButton(parent, name)
 {
     m_color = TQt::black;
     m_popup = new KisColorPopup(m_color, this, "colorpopup");
diff --git a/chalk/ui/kis_color_cup.h b/chalk/ui/kis_color_cup.h
index 7a59837a2..2cf9ddefe 100644
--- a/chalk/ui/kis_color_cup.h
+++ b/chalk/ui/kis_color_cup.h
@@ -60,7 +60,7 @@ class KRITAUI_EXPORT KisColorCup : public TQPushButton {
 
 public:
 
-    KisColorCup(TQWidget * tqparent, const char * name = 0);
+    KisColorCup(TQWidget * parent, const char * name = 0);
     
     virtual ~KisColorCup() {};
     
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc
index 29b9aa8bd..fab8c4bbb 100644
--- a/chalk/ui/kis_controlframe.cc
+++ b/chalk/ui/kis_controlframe.cc
@@ -60,8 +60,8 @@
 #ifdef HAVE_TEXT_BRUSH
 #include "kis_text_brush.h"
 #endif
-KisPopupFrame::KisPopupFrame(TQWidget * tqparent, const char* name)
-    : TQPopupMenu(tqparent, name)
+KisPopupFrame::KisPopupFrame(TQWidget * parent, const char* name)
+    : TQPopupMenu(parent, name)
 {
     setFocusPolicy(TQ_StrongFocus);
 }
diff --git a/chalk/ui/kis_controlframe.h b/chalk/ui/kis_controlframe.h
index 0c16c77f5..ac20191d7 100644
--- a/chalk/ui/kis_controlframe.h
+++ b/chalk/ui/kis_controlframe.h
@@ -56,7 +56,7 @@ class KisPopupFrame : public TQPopupMenu {
 
 public:
 
-    KisPopupFrame(TQWidget * tqparent, const char * name = 0);
+    KisPopupFrame(TQWidget * parent, const char * name = 0);
     virtual void keyPressEvent(TQKeyEvent *);
 
 public:
diff --git a/chalk/ui/kis_cursor.cc b/chalk/ui/kis_cursor.cc
index ca899da86..c4281eac9 100644
--- a/chalk/ui/kis_cursor.cc
+++ b/chalk/ui/kis_cursor.cc
@@ -122,9 +122,9 @@ TQCursor KisCursor::pickerCursor()
         0x74, 0x00, 0x00, 0x32, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap picker_bitmap(24, 24, picker_bits, true); 
-    TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false );
+    TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false );
 
-    return TQCursor( picker_bitmap, picker_tqmask, 1, 22 );
+    return TQCursor( picker_bitmap, picker_mask, 1, 22 );
 }
 
 
@@ -139,9 +139,9 @@ TQCursor KisCursor::pickerPlusCursor()
         0x74, 0x00, 0x0c, 0x32, 0x00, 0x0c, 0x0a, 0x00, 0x0c, 0x00, 0x00, 0x00};
 
     TQBitmap picker_bitmap(24, 24, pickerplus_bits, true); 
-    TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false );
+    TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false );
 
-    return TQCursor( picker_bitmap, picker_tqmask, 1, 22 );
+    return TQCursor( picker_bitmap, picker_mask, 1, 22 );
 }
 
 
@@ -156,9 +156,9 @@ TQCursor KisCursor::pickerMinusCursor()
         0x74, 0x00, 0x00, 0x32, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap picker_bitmap(24, 24, pickerminus_bits, true); 
-    TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false );
+    TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false );
 
-    return TQCursor( picker_bitmap, picker_tqmask, 1, 22 );
+    return TQCursor( picker_bitmap, picker_mask, 1, 22 );
 }
 
 
@@ -174,9 +174,9 @@ TQCursor KisCursor::penCursor()
         0x7c, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap pen_bitmap( 24, 24, pen_bits, true );
-    TQBitmap pen_tqmask = pen_bitmap.createHeuristicMask( false );
+    TQBitmap pen_mask = pen_bitmap.createHeuristicMask( false );
 
-    return TQCursor( pen_bitmap, pen_tqmask, 1, 22 );
+    return TQCursor( pen_bitmap, pen_mask, 1, 22 );
 }
 
 TQCursor KisCursor::brushCursor()
@@ -192,9 +192,9 @@ TQCursor KisCursor::brushCursor()
         0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap brush_bitmap( 25, 23, brush_bits, true );
-    TQBitmap brush_tqmask = brush_bitmap.createHeuristicMask( false );
+    TQBitmap brush_mask = brush_bitmap.createHeuristicMask( false );
 
-    return TQCursor( brush_bitmap, brush_tqmask, 1, 21 );
+    return TQCursor( brush_bitmap, brush_mask, 1, 21 );
 }
 
 TQCursor KisCursor::airbrushCursor()
@@ -208,9 +208,9 @@ TQCursor KisCursor::airbrushCursor()
         0xf8, 0x00, 0x06, 0x76, 0x00, 0x03, 0x36, 0x00, 0x03, 0x00, 0x00, 0x00};
 
     TQBitmap airbrush_bitmap( 24, 24, airbrush_bits, true );
-    TQBitmap airbrush_tqmask = airbrush_bitmap.createHeuristicMask( false );
+    TQBitmap airbrush_mask = airbrush_bitmap.createHeuristicMask( false );
 
-    return TQCursor( airbrush_bitmap, airbrush_tqmask, 1, 22 );
+    return TQCursor( airbrush_bitmap, airbrush_mask, 1, 22 );
 }
 
 TQCursor KisCursor::eraserCursor()
@@ -226,9 +226,9 @@ TQCursor KisCursor::eraserCursor()
         0x10, 0x01, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap eraser_bitmap( 25, 24, eraser_bits, true );
-    TQBitmap eraser_tqmask = eraser_bitmap.createHeuristicMask( false );
+    TQBitmap eraser_mask = eraser_bitmap.createHeuristicMask( false );
 
-    return TQCursor( eraser_bitmap, eraser_tqmask, 7, 22 );
+    return TQCursor( eraser_bitmap, eraser_mask, 7, 22 );
 }
 
 TQCursor KisCursor::fillerCursor()
@@ -242,9 +242,9 @@ TQCursor KisCursor::fillerCursor()
         0x08, 0x60, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap filler_bitmap( 22, 22, filler_bits, true );
-    TQBitmap filler_tqmask = filler_bitmap.createHeuristicMask( false );
+    TQBitmap filler_mask = filler_bitmap.createHeuristicMask( false );
 
-    return TQCursor( filler_bitmap, filler_tqmask, 3, 20 );
+    return TQCursor( filler_bitmap, filler_mask, 3, 20 );
 }
 
 TQCursor KisCursor::colorChangerCursor()
@@ -258,9 +258,9 @@ TQCursor KisCursor::colorChangerCursor()
         0x80, 0x81, 0x01, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap colorChanger_bitmap( 24, 23, colorChanger_bits, true );
-    TQBitmap colorChanger_tqmask = colorChanger_bitmap.createHeuristicMask( false );
+    TQBitmap colorChanger_mask = colorChanger_bitmap.createHeuristicMask( false );
 
-    return TQCursor( colorChanger_bitmap, colorChanger_tqmask, 12, 10 );
+    return TQCursor( colorChanger_bitmap, colorChanger_mask, 12, 10 );
 }
 
 TQCursor KisCursor::zoomCursor()
@@ -274,9 +274,9 @@ TQCursor KisCursor::zoomCursor()
         0x00, 0x00, 0x7c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00};
 
     TQBitmap zoom_bitmap( 24, 23, zoom_bits, true );
-    TQBitmap zoom_tqmask = zoom_bitmap.createHeuristicMask( false );
+    TQBitmap zoom_mask = zoom_bitmap.createHeuristicMask( false );
 
-    return TQCursor( zoom_bitmap, zoom_tqmask, 9, 8 );
+    return TQCursor( zoom_bitmap, zoom_mask, 9, 8 );
 }
 
 TQCursor KisCursor::moveCursor()
@@ -290,9 +290,9 @@ TQCursor KisCursor::moveCursor()
         0x00, 0x7e, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap move_bitmap( 24, 24, move_bits, true );
-    TQBitmap move_tqmask = move_bitmap.createHeuristicMask( false );
+    TQBitmap move_mask = move_bitmap.createHeuristicMask( false );
 
-    return TQCursor( move_bitmap, move_tqmask, 12, 11 );
+    return TQCursor( move_bitmap, move_mask, 12, 11 );
 }
 
 TQCursor KisCursor::handCursor()
@@ -311,9 +311,9 @@ TQCursor KisCursor::selectCursor()
         0x00, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x08, 0x00};
 
     TQBitmap select_bitmap(23, 23, select_bits, true); 
-    TQBitmap select_tqmask = select_bitmap.createHeuristicMask( false );
+    TQBitmap select_mask = select_bitmap.createHeuristicMask( false );
 
-    return TQCursor( select_bitmap, select_tqmask, 11, 11 );
+    return TQCursor( select_bitmap, select_mask, 11, 11 );
 }
 
 TQCursor KisCursor::openHandCursor()
@@ -341,10 +341,10 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY)
     Q_ASSERT(cursorImage.hasAlphaBuffer());
 
     TQBitmap bitmap(cursorImage.width(), cursorImage.height());
-    TQBitmap tqmask(cursorImage.width(), cursorImage.height());
+    TQBitmap mask(cursorImage.width(), cursorImage.height());
 
     TQPainter bitmapPainter(&bitmap);
-    TQPainter maskPainter(&tqmask);
+    TQPainter maskPainter(&mask);
 
     for (TQ_INT32 x = 0; x < cursorImage.width(); ++x) {
         for (TQ_INT32 y = 0; y < cursorImage.height(); ++y) {
@@ -369,6 +369,6 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY)
         }
     }
 
-    return TQCursor(bitmap, tqmask, hotspotX, hotspotY);
+    return TQCursor(bitmap, mask, hotspotX, hotspotY);
 }
 
diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cc
index 49a44cc8c..8091d0fb9 100644
--- a/chalk/ui/kis_custom_brush.cc
+++ b/chalk/ui/kis_custom_brush.cc
@@ -39,8 +39,8 @@
 #include "kis_paint_layer.h"
 #include "kis_group_layer.h"
 
-KisCustomBrush::KisCustomBrush(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view)
-    : KisWdgCustomBrush(tqparent, name), m_view(view)
+KisCustomBrush::KisCustomBrush(TQWidget *parent, const char* name, const TQString& caption, KisView* view)
+    : KisWdgCustomBrush(parent, name), m_view(view)
 {
     Q_ASSERT(m_view);
     m_mediator = 0;
diff --git a/chalk/ui/kis_custom_brush.h b/chalk/ui/kis_custom_brush.h
index 56e90553f..a92ba65c3 100644
--- a/chalk/ui/kis_custom_brush.h
+++ b/chalk/ui/kis_custom_brush.h
@@ -33,7 +33,7 @@ class KisCustomBrush : public KisWdgCustomBrush
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisCustomBrush(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view);
+    KisCustomBrush(TQWidget *parent, const char* name, const TQString& caption, KisView* view);
     virtual ~KisCustomBrush();
     void setResourceServer(KisResourceServerBase* server) { m_server = server; }
     
diff --git a/chalk/ui/kis_custom_image_widget.cc b/chalk/ui/kis_custom_image_widget.cc
index 0b77da9f1..93c829778 100644
--- a/chalk/ui/kis_custom_image_widget.cc
+++ b/chalk/ui/kis_custom_image_widget.cc
@@ -39,8 +39,8 @@
 #include <KoUnitWidgets.h>
 #include <tqlabel.h>
 
-KisCustomImageWidget::KisCustomImageWidget(TQWidget *tqparent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName)
-    : WdgNewImage(tqparent) {
+KisCustomImageWidget::KisCustomImageWidget(TQWidget *parent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName)
+    : WdgNewImage(parent) {
     m_doc = doc;
 
     txtName->setText(imageName);
diff --git a/chalk/ui/kis_custom_image_widget.h b/chalk/ui/kis_custom_image_widget.h
index eef443dc2..a36d44bc4 100644
--- a/chalk/ui/kis_custom_image_widget.h
+++ b/chalk/ui/kis_custom_image_widget.h
@@ -36,10 +36,10 @@ class KisCustomImageWidget : public WdgNewImage {
 public:
     /**
      * Constructor. Please note that this class is being used/created by KisDoc.
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param doc the document that wants to be altered
      */
-    KisCustomImageWidget(TQWidget *tqparent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName);
+    KisCustomImageWidget(TQWidget *parent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName);
 
 private slots:
     void buttonClicked();
diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc
index 47bd63b40..f84bf24d1 100644
--- a/chalk/ui/kis_custom_palette.cc
+++ b/chalk/ui/kis_custom_palette.cc
@@ -39,8 +39,8 @@
 #include "kis_resource_mediator.h"
 #include "kis_resourceserver.h"
 
-KisCustomPalette::KisCustomPalette(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view)
-    : KisWdgCustomPalette(tqparent, name), m_view(view)
+KisCustomPalette::KisCustomPalette(TQWidget *parent, const char* name, const TQString& caption, KisView* view)
+    : KisWdgCustomPalette(parent, name), m_view(view)
 {
     Q_ASSERT(m_view);
     m_mediator = 0;
diff --git a/chalk/ui/kis_custom_palette.h b/chalk/ui/kis_custom_palette.h
index 7ff9c9d8a..e8994c1e4 100644
--- a/chalk/ui/kis_custom_palette.h
+++ b/chalk/ui/kis_custom_palette.h
@@ -34,7 +34,7 @@ class KisCustomPalette : public KisWdgCustomPalette
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisCustomPalette(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view);
+    KisCustomPalette(TQWidget *parent, const char* name, const TQString& caption, KisView* view);
     virtual ~KisCustomPalette();
     void setResourceServer(KisResourceServerBase* server) { m_server = server; }
     void setEditMode(bool b);
diff --git a/chalk/ui/kis_custom_pattern.cc b/chalk/ui/kis_custom_pattern.cc
index 64430f1c3..c5c04f230 100644
--- a/chalk/ui/kis_custom_pattern.cc
+++ b/chalk/ui/kis_custom_pattern.cc
@@ -36,8 +36,8 @@
 #include "kis_resourceserver.h"
 #include "kis_paint_layer.h"
 
-KisCustomPattern::KisCustomPattern(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view)
-    : KisWdgCustomPattern(tqparent, name), m_view(view)
+KisCustomPattern::KisCustomPattern(TQWidget *parent, const char* name, const TQString& caption, KisView* view)
+    : KisWdgCustomPattern(parent, name), m_view(view)
 {
     Q_ASSERT(m_view);
     m_mediator = 0;
diff --git a/chalk/ui/kis_custom_pattern.h b/chalk/ui/kis_custom_pattern.h
index 993c9d107..7850b3704 100644
--- a/chalk/ui/kis_custom_pattern.h
+++ b/chalk/ui/kis_custom_pattern.h
@@ -33,7 +33,7 @@ class KisCustomPattern : public KisWdgCustomPattern
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisCustomPattern(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view);
+    KisCustomPattern(TQWidget *parent, const char* name, const TQString& caption, KisView* view);
     virtual ~KisCustomPattern();
     void setResourceServer(KisResourceServerBase* server) { m_server = server; }
 
diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc
index c955eba36..1cdd309c4 100644
--- a/chalk/ui/kis_dlg_adj_layer_props.cc
+++ b/chalk/ui/kis_dlg_adj_layer_props.cc
@@ -44,9 +44,9 @@
 KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
                                          const TQString & layerName,
                                          const TQString & caption,
-                                         TQWidget *tqparent,
+                                         TQWidget *parent,
                                          const char *name)
-    : KDialogBase(tqparent, name, true, "", Ok | Cancel)
+    : KDialogBase(parent, name, true, "", Ok | Cancel)
 {
     Q_ASSERT( layer );
     m_layer = layer;
diff --git a/chalk/ui/kis_dlg_adj_layer_props.h b/chalk/ui/kis_dlg_adj_layer_props.h
index de8480020..e40635ee8 100644
--- a/chalk/ui/kis_dlg_adj_layer_props.h
+++ b/chalk/ui/kis_dlg_adj_layer_props.h
@@ -50,13 +50,13 @@ public:
      * @param caption the caption for the dialog -- create or properties
      * @param create if true, set the dialog up for creating a new adj. layer, if false, edit the
      *               propeties of the current adj. layer
-     * @param tqparent the widget tqparent of this dialog
+     * @param parent the widget parent of this dialog
      * @param name the TQObject name, if any
      */
     KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
                           const TQString & layerName,
                           const TQString & caption,
-                          TQWidget *tqparent = 0,
+                          TQWidget *parent = 0,
                           const char *name = 0);
 
     KisFilterConfiguration * filterConfiguration() const;
diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc
index 22cb9c0dc..13caff982 100644
--- a/chalk/ui/kis_dlg_adjustment_layer.cc
+++ b/chalk/ui/kis_dlg_adjustment_layer.cc
@@ -44,9 +44,9 @@
 KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img,
                                              const TQString & /*layerName*/,
                                              const TQString & caption,
-                                             TQWidget *tqparent,
+                                             TQWidget *parent,
                                              const char *name)
-    : KDialogBase(tqparent, name, true, "", Ok | Cancel)
+    : KDialogBase(parent, name, true, "", Ok | Cancel)
     , m_image(img)
     , m_currentFilter(0)
     , m_customName(false)
diff --git a/chalk/ui/kis_dlg_adjustment_layer.h b/chalk/ui/kis_dlg_adjustment_layer.h
index 4e20b8fd5..dd7992609 100644
--- a/chalk/ui/kis_dlg_adjustment_layer.h
+++ b/chalk/ui/kis_dlg_adjustment_layer.h
@@ -50,13 +50,13 @@ public:
      * @param caption the caption for the dialog -- create or properties
      * @param create if true, set the dialog up for creating a new adj. layer, if false, edit the
      *               propeties of the current adj. layer
-     * @param tqparent the widget tqparent of this dialog
+     * @param parent the widget parent of this dialog
      * @param name the TQObject name, if any
      */
     KisDlgAdjustmentLayer(KisImage * img,
                           const TQString & layerName,
                           const TQString & caption,
-                          TQWidget *tqparent = 0,
+                          TQWidget *parent = 0,
                           const char *name = 0);
 
     KisFilterConfiguration * filterConfiguration() const;
diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc
index 12134aa0e..5c1367388 100644
--- a/chalk/ui/kis_dlg_apply_profile.cc
+++ b/chalk/ui/kis_dlg_apply_profile.cc
@@ -34,8 +34,8 @@
 #include "wdgapplyprofile.h"
 
 // XXX: Hardcode RGBA name. This should be a constant, somewhere.
-KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *tqparent, const char *name)
-    : super(tqparent, name, true, "", Ok | Cancel)
+KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name)
+    : super(parent, name, true, "", Ok | Cancel)
 {
 
     setCaption(i18n("Apply Image Profile to Clipboard Data"));
diff --git a/chalk/ui/kis_dlg_apply_profile.h b/chalk/ui/kis_dlg_apply_profile.h
index 18f56d0a8..017c54ecf 100644
--- a/chalk/ui/kis_dlg_apply_profile.h
+++ b/chalk/ui/kis_dlg_apply_profile.h
@@ -30,7 +30,7 @@ class KisDlgApplyProfile : public KDialogBase {
   TQ_OBJECT
 
 public:
-    KisDlgApplyProfile(TQWidget *tqparent = 0,
+    KisDlgApplyProfile(TQWidget *parent = 0,
                const char *name = 0);
     virtual ~KisDlgApplyProfile();
 
diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc
index 29d221a0b..ca6a1b721 100644
--- a/chalk/ui/kis_dlg_image_properties.cc
+++ b/chalk/ui/kis_dlg_image_properties.cc
@@ -44,8 +44,8 @@
 #include "squeezedcombobox.h"
 #include "wdgnewimage.h"
 
-KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *tqparent, const char *name)
-    : super(tqparent, name, true, "", Ok | Cancel)
+KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent, const char *name)
+    : super(parent, name, true, "", Ok | Cancel)
 {
 
     setCaption(i18n("Image Properties"));
diff --git a/chalk/ui/kis_dlg_image_properties.h b/chalk/ui/kis_dlg_image_properties.h
index 934adc05f..b5d0a3aee 100644
--- a/chalk/ui/kis_dlg_image_properties.h
+++ b/chalk/ui/kis_dlg_image_properties.h
@@ -33,7 +33,7 @@ class KisDlgImageProperties : public KDialogBase {
 
 public:
     KisDlgImageProperties(KisImageSP image,
-                          TQWidget *tqparent = 0,
+                          TQWidget *parent = 0,
                           const char *name = 0);
     virtual ~KisDlgImageProperties();
 
diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc
index 68df970ba..7742969b2 100644
--- a/chalk/ui/kis_dlg_layer_properties.cc
+++ b/chalk/ui/kis_dlg_layer_properties.cc
@@ -39,8 +39,8 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName,
                      TQ_INT32 opacity,
                      const KisCompositeOp& compositeOp,
                      const KisColorSpace * colorSpace,
-                     TQWidget *tqparent, const char *name, WFlags f)
-    : super(tqparent, name, f, name, Ok | Cancel)
+                     TQWidget *parent, const char *name, WFlags f)
+    : super(parent, name, f, name, Ok | Cancel)
 {
     m_page = new WdgLayerProperties(this);
     m_page->tqlayout()->setMargin(0);
diff --git a/chalk/ui/kis_dlg_layer_properties.h b/chalk/ui/kis_dlg_layer_properties.h
index c2b2a5e0e..d60a6b8f7 100644
--- a/chalk/ui/kis_dlg_layer_properties.h
+++ b/chalk/ui/kis_dlg_layer_properties.h
@@ -35,7 +35,7 @@ public:
                         TQ_INT32 opacity,
                         const KisCompositeOp& compositeOp,
                         const KisColorSpace * colorSpace,
-                        TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0);
+                        TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
 
     virtual ~KisDlgLayerProperties();
 
diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc
index a0a97a7ef..154dbf2cc 100644
--- a/chalk/ui/kis_dlg_new_layer.cc
+++ b/chalk/ui/kis_dlg_new_layer.cc
@@ -43,9 +43,9 @@
 NewLayerDialog::NewLayerDialog(const KisID colorSpaceID,
                    const TQString & profilename,
                    const TQString & deviceName,
-                   TQWidget *tqparent,
+                   TQWidget *parent,
                    const char *name)
-    : super(tqparent, name, true, "", Ok | Cancel)
+    : super(parent, name, true, "", Ok | Cancel)
 {
     m_page = new WdgLayerProperties(this);
     m_page->tqlayout()->setMargin(0);
diff --git a/chalk/ui/kis_dlg_new_layer.h b/chalk/ui/kis_dlg_new_layer.h
index b484e1dce..761b2495d 100644
--- a/chalk/ui/kis_dlg_new_layer.h
+++ b/chalk/ui/kis_dlg_new_layer.h
@@ -38,7 +38,7 @@ public:
     NewLayerDialog(const KisID colorSpace,
                const TQString & profilename,
                const TQString & deviceName,
-               TQWidget *tqparent = 0,
+               TQWidget *parent = 0,
                const char *name = 0);
 
     TQString layerName() const;
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index 941e033e3..a19edebeb 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -108,8 +108,8 @@ float GeneralTab::dockerFontSize()
 
 //---------------------------------------------------------------------------------------------------
 
-ColorSettingsTab::ColorSettingsTab(TQWidget *tqparent, const char *name  )
-    : TQWidget(tqparent, name)
+ColorSettingsTab::ColorSettingsTab(TQWidget *parent, const char *name  )
+    : TQWidget(parent, name)
 {
     // XXX: Make sure only profiles that fit the specified color model
     // are shown in the profile combos
@@ -195,8 +195,8 @@ void ColorSettingsTab::refillPrintProfiles(const KisID & s)
 
 //---------------------------------------------------------------------------------------------------
 
-PerformanceTab::PerformanceTab(TQWidget *tqparent, const char *name  )
-    : WdgPerformanceSettings(tqparent, name)
+PerformanceTab::PerformanceTab(TQWidget *parent, const char *name  )
+    : WdgPerformanceSettings(parent, name)
 {
     // XXX: Make sure only profiles that fit the specified color model
     // are shown in the profile combos
@@ -216,8 +216,8 @@ void PerformanceTab::setDefault()
 
 //---------------------------------------------------------------------------------------------------
 
-TabletSettingsTab::TabletSettingsTab( TQWidget *tqparent, const char *name)
-    : WdgTabletSettings( tqparent, name )
+TabletSettingsTab::TabletSettingsTab( TQWidget *parent, const char *name)
+    : WdgTabletSettings( parent, name )
 {
 #ifdef EXTENDED_X11_TABLET_SUPPORT
     initTabletDevices();
@@ -380,8 +380,8 @@ TQ_INT32 TabletSettingsTab::DeviceSettings::serialNumberAxis() const
 }
 
 TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const TQString& deviceName, DeviceSettings settings,
-                                                                          TQWidget *tqparent, const char *name)
-    : super(tqparent, name, true, "", Ok | Cancel)
+                                                                          TQWidget *parent, const char *name)
+    : super(parent, name, true, "", Ok | Cancel)
 {
     setCaption(i18n("Configure %1").tqarg(deviceName));
 
@@ -611,8 +611,8 @@ void TabletSettingsTab::applyTabletDeviceSettings()
 
 //---------------------------------------------------------------------------------------------------
 
-DisplaySettingsTab::DisplaySettingsTab( TQWidget *tqparent, const char *name)
-    : WdgDisplaySettings( tqparent, name )
+DisplaySettingsTab::DisplaySettingsTab( TQWidget *parent, const char *name)
+    : WdgDisplaySettings( parent, name )
 {
 #ifdef HAVE_GL
     KisConfig cfg;
@@ -646,7 +646,7 @@ void DisplaySettingsTab::slotUseOpenGLToggled(bool /*isChecked*/)
 }
 
 //---------------------------------------------------------------------------------------------------
-GridSettingsTab::GridSettingsTab(TQWidget* tqparent) : WdgGridSettingsBase(tqparent)
+GridSettingsTab::GridSettingsTab(TQWidget* parent) : WdgGridSettingsBase(parent)
 {
     KisConfig cfg;
     selectMainStyle->setCurrentItem(cfg.getGridMainStyle());
@@ -723,8 +723,8 @@ void GridSettingsTab::linkSpacingToggled(bool b)
 
 //---------------------------------------------------------------------------------------------------
 
-PreferencesDialog::PreferencesDialog( TQWidget* tqparent, const char* name )
-    : KDialogBase( IconList, i18n("Preferences"), Ok | Cancel | Help | Default /*| Apply*/, Ok, tqparent, name, true, true )
+PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name )
+    : KDialogBase( IconList, i18n("Preferences"), Ok | Cancel | Help | Default /*| Apply*/, Ok, parent, name, true, true )
 {
     TQVBox *vbox;
 
diff --git a/chalk/ui/kis_dlg_preferences.h b/chalk/ui/kis_dlg_preferences.h
index 61f4a5867..908caf8e1 100644
--- a/chalk/ui/kis_dlg_preferences.h
+++ b/chalk/ui/kis_dlg_preferences.h
@@ -53,7 +53,7 @@ class GeneralTab : public WdgGeneralSettings
 
 public:
 
-    GeneralTab( TQWidget *tqparent = 0, const char *name = 0 );
+    GeneralTab( TQWidget *parent = 0, const char *name = 0 );
 
     enumCursorStyle cursorStyle();
     enumKoDockability dockability();
@@ -72,7 +72,7 @@ class ColorSettingsTab : public TQWidget
 
 public:
 
-    ColorSettingsTab( TQWidget *tqparent = 0, const char * name = 0 );
+    ColorSettingsTab( TQWidget *parent = 0, const char * name = 0 );
 
 private slots:
 
@@ -94,7 +94,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    PerformanceTab( TQWidget *tqparent = 0, const char *name = 0 );
+    PerformanceTab( TQWidget *parent = 0, const char *name = 0 );
 
 public:
     void setDefault();
@@ -112,7 +112,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    TabletSettingsTab( TQWidget *tqparent = 0, const char *name = 0 );
+    TabletSettingsTab( TQWidget *parent = 0, const char *name = 0 );
 
 public:
     void setDefault();
@@ -180,7 +180,7 @@ private:
     public:
         TabletDeviceSettingsDialog(const TQString& deviceName,
                                    DeviceSettings settings,
-                                   TQWidget *tqparent = 0,
+                                   TQWidget *parent = 0,
                                    const char *name = 0);
         virtual ~TabletDeviceSettingsDialog();
 
@@ -209,7 +209,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    DisplaySettingsTab( TQWidget *tqparent = 0, const char *name = 0 );
+    DisplaySettingsTab( TQWidget *parent = 0, const char *name = 0 );
 
 public:
     void setDefault();
@@ -227,7 +227,7 @@ class GridSettingsTab : public WdgGridSettingsBase {
     Q_OBJECT
   TQ_OBJECT
     public:
-        GridSettingsTab(TQWidget* tqparent);
+        GridSettingsTab(TQWidget* parent);
     public:
         void setDefault();
     private slots:
@@ -256,7 +256,7 @@ public:
 
 protected:
 
-    PreferencesDialog( TQWidget *tqparent = 0, const char *name = 0 );
+    PreferencesDialog( TQWidget *parent = 0, const char *name = 0 );
     ~PreferencesDialog();
 
 protected:
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc
index 1fc1c9c91..6bae7e781 100644
--- a/chalk/ui/kis_doc.cc
+++ b/chalk/ui/kis_doc.cc
@@ -137,8 +137,8 @@ namespace {
 
 }
 
-KisDoc::KisDoc(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) :
-    super(parentWidget, widgetName, tqparent, name, singleViewMode)
+KisDoc::KisDoc(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, bool singleViewMode) :
+    super(parentWidget, widgetName, parent, name, singleViewMode)
 {
 
     m_undo = false;
@@ -460,7 +460,7 @@ KisImageSP KisDoc::loadImage(const TQDomElement& element)
     return img;
 }
 
-void KisDoc::loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP tqparent)
+void KisDoc::loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP parent)
 {
     TQDomNode node = element.firstChild();
     TQDomNode child;
@@ -477,7 +477,7 @@ void KisDoc::loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLay
                     }
                     else {
                         img->nextLayerName(); // Make sure the nameserver is current with the number of layers.
-                        img->addLayer(layer, tqparent, 0);
+                        img->addLayer(layer, parent, 0);
                     }
                 }
             }
@@ -593,11 +593,11 @@ KisLayerSP KisDoc::loadPaintLayer(const TQDomElement& element, KisImageSP img,
     else
         m_layerFilenames[layer.data()] = TQString(element.attribute("filename"));
 
-    if ((attr = element.attribute("hastqmask")).isNull())
+    if ((attr = element.attribute("hasmask")).isNull())
         attr = "0";
 
     if (attr == "1") {
-        // We add a tqmask, but we'll fill in the actual tqmask later in completeLoading with the visitor
+        // We add a mask, but we'll fill in the actual mask later in completeLoading with the visitor
         layer->createMask();
     }
 
@@ -805,7 +805,7 @@ bool KisDoc::completeLoading(KoStore *store)
     return true;
 }
 
-TQWidget* KisDoc::createCustomDocumentWidget(TQWidget *tqparent)
+TQWidget* KisDoc::createCustomDocumentWidget(TQWidget *parent)
 {
 
     KisConfig cfg;
@@ -818,7 +818,7 @@ TQWidget* KisDoc::createCustomDocumentWidget(TQWidget *tqparent)
         w = sz.width();
         h = sz.height();
     }
-    return new KisCustomImageWidget(tqparent, this, w, h, cfg.defImgResolution(), cfg.workingColorSpace(),"unnamed");
+    return new KisCustomImageWidget(parent, this, w, h, cfg.defImgResolution(), cfg.workingColorSpace(),"unnamed");
 }
 
 
@@ -931,9 +931,9 @@ bool KisDoc::newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, Kis
     return true;
 }
 
-KoView* KisDoc::createViewInstance(TQWidget* tqparent, const char *name)
+KoView* KisDoc::createViewInstance(TQWidget* parent, const char *name)
 {
-    KisView * v = new KisView(this, this, tqparent, name);
+    KisView * v = new KisView(this, this, parent, name);
     Q_CHECK_PTR(v);
 
     return v;
diff --git a/chalk/ui/kis_doc.h b/chalk/ui/kis_doc.h
index 222e9da65..f09cf39da 100644
--- a/chalk/ui/kis_doc.h
+++ b/chalk/ui/kis_doc.h
@@ -53,7 +53,7 @@ class KRITACORE_EXPORT KisDoc : public KoDocument, private KisUndoAdapter {
   TQ_OBJECT
 
 public:
-    KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false);
+    KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false);
     virtual ~KisDoc();
 
 public:
@@ -68,7 +68,7 @@ public:
     virtual bool loadChildren( KoStore* store);
     virtual bool loadXML(TQIODevice *, const TQDomDocument& doc);
     virtual TQCString mimeType() const;
-    virtual TQWidget* createCustomDocumentWidget(TQWidget *tqparent);
+    virtual TQWidget* createCustomDocumentWidget(TQWidget *parent);
     virtual KoDocument* hitTest(const TQPoint &pos, const TQWMatrix& matrix = TQWMatrix());
 
     /**
@@ -114,13 +114,13 @@ public:
     void setRedoLimit(TQ_INT32 limit);
 
     /**
-     * Create a new image that has this document as a tqparent and
+     * Create a new image that has this document as a parent and
      * replace the current image with this image.
      */
     bool newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, KisColorSpace * cs, const KisColor &bgColor, const TQString &imgDescription, const double imgResolution);
 
     /**
-     * Create a new image that has this document as a tqparent and
+     * Create a new image that has this document as a parent and
      * replace the current image with this image.
      */
     KisImageSP newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, KisColorSpace * colorstrategy);
@@ -168,7 +168,7 @@ signals:
 
 protected:
     // Overide KoDocument
-    virtual KoView* createViewInstance(TQWidget *tqparent, const char *name);
+    virtual KoView* createViewInstance(TQWidget *parent, const char *name);
 
 protected slots:
     // Overide KoDocument
@@ -183,7 +183,7 @@ private:
     
     TQDomElement saveImage(TQDomDocument& doc, KisImageSP img);
     KisImageSP loadImage(const TQDomElement& elem);
-    void loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP tqparent);
+    void loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP parent);
     KisLayerSP loadLayer(const TQDomElement& elem, KisImageSP img);
     KisLayerSP loadPaintLayer(const TQDomElement& elem, KisImageSP img,
                 TQString name, TQ_INT32 x, TQ_INT32 y, TQ_INT32 opacity, bool visible, bool locked,
diff --git a/chalk/ui/kis_double_widget.cc b/chalk/ui/kis_double_widget.cc
index 3c13a47ed..6c03b3e95 100644
--- a/chalk/ui/kis_double_widget.cc
+++ b/chalk/ui/kis_double_widget.cc
@@ -27,14 +27,14 @@
 
 #include "kis_double_widget.h"
 
-KisDoubleWidget::KisDoubleWidget(TQWidget* tqparent, const char* name)
-  : super(tqparent, name)
+KisDoubleWidget::KisDoubleWidget(TQWidget* parent, const char* name)
+  : super(parent, name)
 {
     init(0, 1);
 }
 
-KisDoubleWidget::KisDoubleWidget(double min, double max, TQWidget* tqparent, const char* name)
-  : super(tqparent, name)
+KisDoubleWidget::KisDoubleWidget(double min, double max, TQWidget* parent, const char* name)
+  : super(parent, name)
 {
     init(min, max);
 }
diff --git a/chalk/ui/kis_double_widget.h b/chalk/ui/kis_double_widget.h
index 89a425b7e..beb1cdd03 100644
--- a/chalk/ui/kis_double_widget.h
+++ b/chalk/ui/kis_double_widget.h
@@ -35,8 +35,8 @@ class KisDoubleWidget : public TQWidget
 
     typedef TQWidget super;
 public:
-    KisDoubleWidget(TQWidget* tqparent = 0, const char* name = 0);
-    KisDoubleWidget(double min, double max, TQWidget* tqparent = 0, const char* name = 0);
+    KisDoubleWidget(TQWidget* parent = 0, const char* name = 0);
+    KisDoubleWidget(double min, double max, TQWidget* parent = 0, const char* name = 0);
     ~KisDoubleWidget();
 
     double value() const;
diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc
index aa84aa617..519ca8782 100644
--- a/chalk/ui/kis_factory.cc
+++ b/chalk/ui/kis_factory.cc
@@ -50,8 +50,8 @@ KInstance* KisFactory::s_instance = 0;
 
 
 
-KisFactory::KisFactory( TQObject* tqparent, const char* name )
-    : KoFactory( tqparent, name )
+KisFactory::KisFactory( TQObject* parent, const char* name )
+    : KoFactory( parent, name )
 {
     s_aboutData = newChalkAboutData();
 
@@ -79,13 +79,13 @@ KisFactory::~KisFactory()
  * Create the document
  */
 KParts::Part* KisFactory::createPartObject( TQWidget *parentWidget,
-                        const char *widgetName, TQObject* tqparent,
+                        const char *widgetName, TQObject* parent,
                         const char* name, const char* classname, const TQStringList & )
 {
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
     KisDoc *doc = new KisDoc( parentWidget,
-                  widgetName, tqparent, name, !bWantKoDocument );
+                  widgetName, parent, name, !bWantKoDocument );
     Q_CHECK_PTR(doc);
 
     if ( !bWantKoDocument )
diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h
index da9d3e409..660e77dd5 100644
--- a/chalk/ui/kis_factory.h
+++ b/chalk/ui/kis_factory.h
@@ -38,12 +38,12 @@ class KRITACORE_EXPORT KisFactory : public KoFactory
   TQ_OBJECT
 
 public:
-    KisFactory( TQObject* tqparent = 0, const char* name = 0 );
+    KisFactory( TQObject* parent = 0, const char* name = 0 );
     ~KisFactory();
 
     virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0,
                            const char *widgetName = 0,
-                           TQObject *tqparent = 0,
+                           TQObject *parent = 0,
                            const char *name = 0,
                            const char *classname = "KoDocument",
                            const TQStringList &args = TQStringList() );
diff --git a/chalk/ui/kis_filter_manager.h b/chalk/ui/kis_filter_manager.h
index beaf66a2e..a155e74af 100644
--- a/chalk/ui/kis_filter_manager.h
+++ b/chalk/ui/kis_filter_manager.h
@@ -48,7 +48,7 @@ class KRITACORE_EXPORT KisFilterManager : public TQObject {
 
 public:
 
-    KisFilterManager(KisView * tqparent, KisDoc * doc);
+    KisFilterManager(KisView * parent, KisDoc * doc);
     ~KisFilterManager();
 
     void setup(KActionCollection * ac);
diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc
index 163c88a4b..f2d63cc39 100644
--- a/chalk/ui/kis_filters_listview.cc
+++ b/chalk/ui/kis_filters_listview.cc
@@ -40,8 +40,8 @@
 
 // ------------------------------------------------
 
-KisFiltersThumbnailThread::KisFiltersThumbnailThread(TQIconView * tqparent, KisFiltersIconViewItem * iconItem, KisFilterConfiguration * config, KisFilter * filter, KisPaintDeviceSP dev, const TQRect & bounds, KisProfile * profile)
-    : m_parent(tqparent)
+KisFiltersThumbnailThread::KisFiltersThumbnailThread(TQIconView * parent, KisFiltersIconViewItem * iconItem, KisFilterConfiguration * config, KisFilter * filter, KisPaintDeviceSP dev, const TQRect & bounds, KisProfile * profile)
+    : m_parent(parent)
     , m_iconItem(iconItem)
     , m_config(config)
     , m_filter(filter)
@@ -87,15 +87,15 @@ void KisFiltersThumbnailThread::cancel()
 
 // ------------------------------------------------
 
-KisFiltersIconViewItem::KisFiltersIconViewItem(TQIconView * tqparent, const TQString & text, const TQPixmap & icon,
+KisFiltersIconViewItem::KisFiltersIconViewItem(TQIconView * parent, const TQString & text, const TQPixmap & icon,
                                                KisID id, KisFilter* filter, KisFilterConfiguration* filterConfig,
                                                KisPaintDeviceSP thumb, const TQRect & bounds, KisProfile * profile)
-    : TQIconViewItem(tqparent, text, icon)
+    : TQIconViewItem(parent, text, icon)
     , m_id(id)
     , m_filter(filter)
     , m_filterconfig(filterConfig)
 {
-    m_thread = new KisFiltersThumbnailThread(tqparent, this, filterConfig, filter, thumb, bounds, profile);
+    m_thread = new KisFiltersThumbnailThread(parent, this, filterConfig, filter, thumb, bounds, profile);
 }
 
 KisFiltersIconViewItem::~KisFiltersIconViewItem()
@@ -106,8 +106,8 @@ KisFiltersIconViewItem::~KisFiltersIconViewItem()
 
 // ------------------------------------------------
 
-KisFiltersListView::KisFiltersListView(TQWidget* tqparent, bool filterForAdjustmentLayers, const char* name)
-    : KIconView(tqparent, name)
+KisFiltersListView::KisFiltersListView(TQWidget* parent, bool filterForAdjustmentLayers, const char* name)
+    : KIconView(parent, name)
     , m_original(0)
     , m_profile(0)
     , m_filterForAdjustmentLayers(filterForAdjustmentLayers)
@@ -115,8 +115,8 @@ KisFiltersListView::KisFiltersListView(TQWidget* tqparent, bool filterForAdjustm
     init();
 }
 
-KisFiltersListView::KisFiltersListView(TQWidget * tqparent, const char * name, WFlags f, bool filterForAdjustmentLayers)
-    : KIconView(tqparent, name, f)
+KisFiltersListView::KisFiltersListView(TQWidget * parent, const char * name, WFlags f, bool filterForAdjustmentLayers)
+    : KIconView(parent, name, f)
     , m_original(0)
     , m_profile(0)
     , m_filterForAdjustmentLayers(filterForAdjustmentLayers)
@@ -124,8 +124,8 @@ KisFiltersListView::KisFiltersListView(TQWidget * tqparent, const char * name, W
     init();
 }
 
-KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* tqparent, bool filterForAdjustmentLayers, const char * name)
-    : KIconView(tqparent, name)
+KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool filterForAdjustmentLayers, const char * name)
+    : KIconView(parent, name)
     , m_original(0)
     , m_profile(0)
     , m_filterForAdjustmentLayers(filterForAdjustmentLayers)
@@ -139,8 +139,8 @@ KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* tqparent, boo
     init();
 }
 
-KisFiltersListView::KisFiltersListView(KisPaintDeviceSP device, TQWidget* tqparent, bool filterForAdjustmentLayers, const char * name)
-    : KIconView(tqparent, name)
+KisFiltersListView::KisFiltersListView(KisPaintDeviceSP device, TQWidget* parent, bool filterForAdjustmentLayers, const char * name)
+    : KIconView(parent, name)
     , m_original(device)
     , m_profile(0)
     , m_filterForAdjustmentLayers(filterForAdjustmentLayers)
diff --git a/chalk/ui/kis_filters_listview.h b/chalk/ui/kis_filters_listview.h
index c4979e250..3b7fa77bc 100644
--- a/chalk/ui/kis_filters_listview.h
+++ b/chalk/ui/kis_filters_listview.h
@@ -58,7 +58,7 @@ class KisFiltersThumbnailThread : public KisThread
 {
 public:
 
-    KisFiltersThumbnailThread(TQIconView * tqparent,
+    KisFiltersThumbnailThread(TQIconView * parent,
                               KisFiltersIconViewItem * iconItem,
                               KisFilterConfiguration * config, KisFilter * filter,
                               KisPaintDeviceSP dev, const TQRect & bounds,
@@ -83,7 +83,7 @@ private:
 
 class KisFiltersIconViewItem : public TQIconViewItem {
 public:
-    KisFiltersIconViewItem( TQIconView * tqparent, const TQString & text, const TQPixmap & icon,
+    KisFiltersIconViewItem( TQIconView * parent, const TQString & text, const TQPixmap & icon,
                             KisID id, KisFilter* filter, KisFilterConfiguration* filterConfig,
                             KisPaintDeviceSP thumb, const TQRect & bounds, KisProfile * profile);
 
@@ -105,10 +105,10 @@ private:
 class KisFiltersListView : public KIconView {
 
 public:
-    explicit KisFiltersListView(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0, bool filterForAdjustmentLayers = false);
-    KisFiltersListView(TQWidget* tqparent, bool filterForAdjustmentLayers = false, const char* name = 0);
-    KisFiltersListView(KisLayerSP layer, TQWidget* tqparent, bool filterForAdjustmentLayers = false,  const char * name = 0) KDE_DEPRECATED;
-    KisFiltersListView(KisPaintDeviceSP layer, TQWidget* tqparent, bool filterForAdjustmentLayers = false,  const char * name = 0);
+    explicit KisFiltersListView(TQWidget * parent = 0, const char * name = 0, WFlags f = 0, bool filterForAdjustmentLayers = false);
+    KisFiltersListView(TQWidget* parent, bool filterForAdjustmentLayers = false, const char* name = 0);
+    KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool filterForAdjustmentLayers = false,  const char * name = 0) KDE_DEPRECATED;
+    KisFiltersListView(KisPaintDeviceSP layer, TQWidget* parent, bool filterForAdjustmentLayers = false,  const char * name = 0);
         
     virtual void customEvent(TQCustomEvent *);
 
diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc
index 7e416ea1b..203f0718a 100644
--- a/chalk/ui/kis_gradient_chooser.cc
+++ b/chalk/ui/kis_gradient_chooser.cc
@@ -32,15 +32,15 @@
 
 #include "kis_gradient_chooser.h"
 
-KisCustomGradientDialog::KisCustomGradientDialog(KisView * view, TQWidget * tqparent, const char *name)
-    : KDialogBase(tqparent, name, false, i18n("Custom Gradient"), Close)
+KisCustomGradientDialog::KisCustomGradientDialog(KisView * view, TQWidget * parent, const char *name)
+    : KDialogBase(parent, name, false, i18n("Custom Gradient"), Close)
 {
     m_page = new KisAutogradient(this, "autogradient", i18n("Custom Gradient"));
     setMainWidget(m_page);
     connect(m_page, TQT_SIGNAL(activatedResource(KisResource *)), view, TQT_SLOT(gradientActivated(KisResource*)));
 }
 
-KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *tqparent, const char *name) : super(tqparent, name)
+KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const char *name) : super(parent, name)
 {
     m_lbName = new TQLabel(this);
     
diff --git a/chalk/ui/kis_gradient_chooser.h b/chalk/ui/kis_gradient_chooser.h
index fc154f3c5..3553213fc 100644
--- a/chalk/ui/kis_gradient_chooser.h
+++ b/chalk/ui/kis_gradient_chooser.h
@@ -33,7 +33,7 @@ class KisCustomGradientDialog : public KDialogBase {
 
 public:
 
-    KisCustomGradientDialog(KisView * view, TQWidget * tqparent, const char *name);
+    KisCustomGradientDialog(KisView * view, TQWidget * parent, const char *name);
     
 private:
     
@@ -48,7 +48,7 @@ class KisGradientChooser : public KisItemChooser {
 
 public:
     // XXX: On library redesign, remove m_view parameter here, it's just a temporary hack for the autogradient dialog!
-    KisGradientChooser(KisView * view, TQWidget *tqparent = 0, const char *name = 0);
+    KisGradientChooser(KisView * view, TQWidget *parent = 0, const char *name = 0);
     virtual ~KisGradientChooser();
 
 protected:
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index 0547bdb50..cda77d689 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -30,8 +30,8 @@
 #define MARGIN 5
 #define HANDLE_SIZE 10
 
-KisGradientSliderWidget::KisGradientSliderWidget(TQWidget *tqparent, const char* name, WFlags f )
-    : TQWidget( tqparent, name, f),
+KisGradientSliderWidget::KisGradientSliderWidget(TQWidget *parent, const char* name, WFlags f )
+    : TQWidget( parent, name, f),
     m_currentSegment(0),
     m_selectedSegment(0),
     m_drag(0)
diff --git a/chalk/ui/kis_gradient_slider_widget.h b/chalk/ui/kis_gradient_slider_widget.h
index d15ac1c49..995b3a59e 100644
--- a/chalk/ui/kis_gradient_slider_widget.h
+++ b/chalk/ui/kis_gradient_slider_widget.h
@@ -33,7 +33,7 @@ class KisGradientSliderWidget : public TQWidget
   TQ_OBJECT
 
 public:
-    KisGradientSliderWidget(TQWidget *tqparent = 0, const char* name = 0, WFlags f = 0);
+    KisGradientSliderWidget(TQWidget *parent = 0, const char* name = 0, WFlags f = 0);
 
 public:
     virtual void paintEvent ( TQPaintEvent * );
diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp
index 53ee931c8..5eda1cf9a 100644
--- a/chalk/ui/kis_grid_manager.cpp
+++ b/chalk/ui/kis_grid_manager.cpp
@@ -40,8 +40,8 @@
 #include "kis_image.h"
 #include "kis_view.h"
 
-KisGridManager::KisGridManager(KisView * tqparent)
-    : TQObject(tqparent), m_view(tqparent)
+KisGridManager::KisGridManager(KisView * parent)
+    : TQObject(parent), m_view(parent)
 {
 
 }
diff --git a/chalk/ui/kis_grid_manager.h b/chalk/ui/kis_grid_manager.h
index f4708ef04..16ae03f50 100644
--- a/chalk/ui/kis_grid_manager.h
+++ b/chalk/ui/kis_grid_manager.h
@@ -35,7 +35,7 @@ class KisGridManager : public TQObject
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisGridManager(KisView * tqparent);
+        KisGridManager(KisView * parent);
         ~KisGridManager();
     public:
         void setup(KActionCollection * collection);
diff --git a/chalk/ui/kis_histogram_view.cc b/chalk/ui/kis_histogram_view.cc
index cc4fe59c5..3b94db619 100644
--- a/chalk/ui/kis_histogram_view.cc
+++ b/chalk/ui/kis_histogram_view.cc
@@ -38,8 +38,8 @@
 #include "kis_basic_histogram_producers.h"
 #include "kis_paint_device.h"
 
-KisHistogramView::KisHistogramView(TQWidget *tqparent, const char *name, WFlags f)
-    : TQLabel(tqparent, name, f)
+KisHistogramView::KisHistogramView(TQWidget *parent, const char *name, WFlags f)
+    : TQLabel(parent, name, f)
 {
     // This is needed until we can computationally scale it well. Until then, this is needed
     // And when we have it, it won't hurt to have it around
diff --git a/chalk/ui/kis_histogram_view.h b/chalk/ui/kis_histogram_view.h
index 6b4524a8f..92ab8f209 100644
--- a/chalk/ui/kis_histogram_view.h
+++ b/chalk/ui/kis_histogram_view.h
@@ -49,7 +49,7 @@ class KisHistogramView : public TQLabel {
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisHistogramView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0);
+    KisHistogramView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
     virtual ~KisHistogramView();
 
     void setPaintDevice(KisPaintDeviceSP dev);
diff --git a/chalk/ui/kis_iconwidget.cc b/chalk/ui/kis_iconwidget.cc
index 3e9ce4f1d..0109f7ebd 100644
--- a/chalk/ui/kis_iconwidget.cc
+++ b/chalk/ui/kis_iconwidget.cc
@@ -21,7 +21,7 @@
 #include <koIconChooser.h>
 #include "kis_iconwidget.h"
 
-KisIconWidget::KisIconWidget(TQWidget *tqparent, const char *name) : super(tqparent, name)
+KisIconWidget::KisIconWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_item = 0;
 }
diff --git a/chalk/ui/kis_iconwidget.h b/chalk/ui/kis_iconwidget.h
index d65cbcbdf..45733d135 100644
--- a/chalk/ui/kis_iconwidget.h
+++ b/chalk/ui/kis_iconwidget.h
@@ -34,7 +34,7 @@ class KisIconWidget : public TQToolButton {
  * are shown.
  */
 public:
-    KisIconWidget(TQWidget *tqparent = 0, const char *name = 0);
+    KisIconWidget(TQWidget *parent = 0, const char *name = 0);
 
 public slots:
     void slotSetItem(KoIconItem& item);
diff --git a/chalk/ui/kis_import_catcher.cc b/chalk/ui/kis_import_catcher.cc
index b2d04cab2..26040309b 100644
--- a/chalk/ui/kis_import_catcher.cc
+++ b/chalk/ui/kis_import_catcher.cc
@@ -54,23 +54,23 @@ void KisImportCatcher::slotLoadingFinished()
                 // Don't import the root if this is not a layered image (1 group layer
                 // plus 1 other).
                 importedImageLayer = importedImageLayer->firstChild();
-                importedImageLayer->tqparent()->removeLayer(importedImageLayer);
+                importedImageLayer->parent()->removeLayer(importedImageLayer);
             }
 
             importedImageLayer->setName(m_url.prettyURL());
 
-            KisGroupLayerSP tqparent = 0;
+            KisGroupLayerSP parent = 0;
             KisLayerSP currentActiveLayer = m_image->activeLayer();
 
             if (currentActiveLayer) {
-                tqparent = currentActiveLayer->tqparent();
+                parent = currentActiveLayer->parent();
             }
 
-            if (tqparent == 0) {
-                tqparent = m_image->rootLayer();
+            if (parent == 0) {
+                parent = m_image->rootLayer();
             }
 
-            m_image->addLayer(importedImageLayer.data(), tqparent, currentActiveLayer);
+            m_image->addLayer(importedImageLayer.data(), parent, currentActiveLayer);
         }
     }
     m_doc->deleteLater();
diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc
index 8dc0e68db..1375caccb 100644
--- a/chalk/ui/kis_int_spinbox.cc
+++ b/chalk/ui/kis_int_spinbox.cc
@@ -61,14 +61,14 @@ public:
 };
 
 
-KisIntSpinbox::KisIntSpinbox(TQWidget *tqparent, const char *name)
-    : TQWidget(tqparent, name)
+KisIntSpinbox::KisIntSpinbox(TQWidget *parent, const char *name)
+    : TQWidget(parent, name)
 {
     init(0);
 }
 
-KisIntSpinbox::KisIntSpinbox(const TQString & /*label*/, int val, TQWidget *tqparent, const char *name)
-    : TQWidget(tqparent, name)
+KisIntSpinbox::KisIntSpinbox(const TQString & /*label*/, int val, TQWidget *parent, const char *name)
+    : TQWidget(parent, name)
 {
     init(val);
 }
diff --git a/chalk/ui/kis_int_spinbox.h b/chalk/ui/kis_int_spinbox.h
index a5c4602e0..469de0997 100644
--- a/chalk/ui/kis_int_spinbox.h
+++ b/chalk/ui/kis_int_spinbox.h
@@ -38,8 +38,8 @@ class KisPopupSlider : public TQPopupMenu {
 
 public:
 
-    KisPopupSlider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, TQWidget * tqparent, const char * name = 0) 
-        : TQPopupMenu(tqparent, name)
+    KisPopupSlider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, TQWidget * parent, const char * name = 0) 
+        : TQPopupMenu(parent, name)
     {
         m_slider = new TQSlider(minValue, maxValue, pageStep, value, orientation, this, name);
         //m_slider->setTracking(false);
@@ -86,10 +86,10 @@ public:
      * Constructs an input control for integer values
      * with base 10 and initial value 0.
      * 
-     * @param tqparent tqparent TQWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      */
-    KisIntSpinbox(TQWidget *tqparent=0, const char *name=0);
+    KisIntSpinbox(TQWidget *parent=0, const char *name=0);
     /**
      * Constructor
      * It constructs a TQSpinBox that allows the input of integer numbers
@@ -98,10 +98,10 @@ public:
      *
      * @param label the tabel (may contain &, and my be empty)
      * @param value  initial value for the control
-     * @param tqparent tqparent TQWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      */
-    KisIntSpinbox(const TQString & label, int value, TQWidget* tqparent=0, const char *name=0);
+    KisIntSpinbox(const TQString & label, int value, TQWidget* parent=0, const char *name=0);
 
     /**
      * Destructor
diff --git a/chalk/ui/kis_itemchooser.cc b/chalk/ui/kis_itemchooser.cc
index d418bd2fc..36513c32a 100644
--- a/chalk/ui/kis_itemchooser.cc
+++ b/chalk/ui/kis_itemchooser.cc
@@ -25,7 +25,7 @@
 #include "kis_global.h"
 #include "kis_icon_item.h"
 
-KisItemChooser::KisItemChooser(TQWidget *tqparent, const char *name) : super(tqparent, name)
+KisItemChooser::KisItemChooser(TQWidget *parent, const char *name) : super(parent, name)
 {
 /*    m_frame = new TQVBox(this);
     m_frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);*/
diff --git a/chalk/ui/kis_itemchooser.h b/chalk/ui/kis_itemchooser.h
index d29aa28d6..bb84ddcc8 100644
--- a/chalk/ui/kis_itemchooser.h
+++ b/chalk/ui/kis_itemchooser.h
@@ -34,7 +34,7 @@ class KisItemChooser : public TQWidget {
   TQ_OBJECT
 
 public:
-    KisItemChooser(TQWidget *tqparent = 0,
+    KisItemChooser(TQWidget *parent = 0,
                const char *name = 0);
     virtual ~KisItemChooser();
 
diff --git a/chalk/ui/kis_label_cursor_pos.cc b/chalk/ui/kis_label_cursor_pos.cc
index 984df6dd2..d28f1a83b 100644
--- a/chalk/ui/kis_label_cursor_pos.cc
+++ b/chalk/ui/kis_label_cursor_pos.cc
@@ -18,12 +18,12 @@
 #include "kis_label_cursor_pos.h"
 #include "kis_label_cursor_pos.moc"
 
-KisLabelCursorPos::KisLabelCursorPos(TQWidget *tqparent, const char *name, WFlags f) : super(tqparent, name, f)
+KisLabelCursorPos::KisLabelCursorPos(TQWidget *parent, const char *name, WFlags f) : super(parent, name, f)
 {
     setText("0:0");
     m_doUpdates = true;
     
-    //setMinimumSize( 200, tqparent->height() - 4);
+    //setMinimumSize( 200, parent->height() - 4);
 }
 
 KisLabelCursorPos::~KisLabelCursorPos()
diff --git a/chalk/ui/kis_label_cursor_pos.h b/chalk/ui/kis_label_cursor_pos.h
index 392a0b689..ff7301f16 100644
--- a/chalk/ui/kis_label_cursor_pos.h
+++ b/chalk/ui/kis_label_cursor_pos.h
@@ -26,7 +26,7 @@ class KisLabelCursorPos : public TQLabel {
     typedef TQLabel super;
 
 public:
-    KisLabelCursorPos(TQWidget *tqparent, const char *name = 0, WFlags f = 0);
+    KisLabelCursorPos(TQWidget *parent, const char *name = 0, WFlags f = 0);
     virtual ~KisLabelCursorPos();
 
 public slots:
diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc
index c04452f4d..c081111f0 100644
--- a/chalk/ui/kis_label_progress.cc
+++ b/chalk/ui/kis_label_progress.cc
@@ -36,7 +36,7 @@ class EscapeButton : public TQToolButton {
 
 public:
 
-    EscapeButton(TQWidget * tqparent, const char * name) : TQToolButton(tqparent, name) {};
+    EscapeButton(TQWidget * parent, const char * name) : TQToolButton(parent, name) {};
 
     void keyReleaseEvent(TQKeyEvent *e)
     {
@@ -45,7 +45,7 @@ public:
     }
 };
 
-KisLabelProgress::KisLabelProgress(TQWidget *tqparent, const char *name, WFlags f) : super(tqparent, name, f)
+KisLabelProgress::KisLabelProgress(TQWidget *parent, const char *name, WFlags f) : super(parent, name, f)
 {
     m_subject = 0;
     m_modal = false;
diff --git a/chalk/ui/kis_label_progress.h b/chalk/ui/kis_label_progress.h
index a2c42fd9f..0539a1436 100644
--- a/chalk/ui/kis_label_progress.h
+++ b/chalk/ui/kis_label_progress.h
@@ -33,7 +33,7 @@ class KisLabelProgress : public TQLabel, public KisProgressDisplayInterface {
     typedef TQLabel super;
 
 public:
-    KisLabelProgress(TQWidget *tqparent, const char *name = 0, WFlags f = 0);
+    KisLabelProgress(TQWidget *parent, const char *name = 0, WFlags f = 0);
     virtual ~KisLabelProgress();
 
 public:
diff --git a/chalk/ui/kis_label_zoom.h b/chalk/ui/kis_label_zoom.h
index e7fad08a1..a2cff7eac 100644
--- a/chalk/ui/kis_label_zoom.h
+++ b/chalk/ui/kis_label_zoom.h
@@ -24,8 +24,8 @@ class KisLabelZoom : public TQLabel {
     Q_OBJECT
   TQ_OBJECT
         
-    KisLabelZoom( TQWidget *tqparent, const char *name = 0, WFlags f = 0 ) :
-        TQLabel( tqparent, name, f ) {}
+    KisLabelZoom( TQWidget *parent, const char *name = 0, WFlags f = 0 ) :
+        TQLabel( parent, name, f ) {}
     virtual ~KisLabelZoom() {}
         
 };
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index cfdc6acdb..424c405db 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -61,8 +61,8 @@
 
 #include "kis_layerbox.h"
 
-KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *tqparent, const char *name)
-    : super(tqparent, name), m_image(0)
+KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char *name)
+    : super(parent, name), m_image(0)
 {
     TQVBoxLayout *vbox = new TQVBoxLayout(this);
     vbox->setAutoAdd(true);
@@ -200,7 +200,7 @@ void KisLayerBox::slotLayerAdded(KisLayerSP layer)
 
     vKisLayerSP layersAdded;
 
-    if (layer->tqparent() == m_image->rootLayer())
+    if (layer->parent() == m_image->rootLayer())
     {
         KisPopulateVisitor visitor(list());
         layer->accept(visitor);
@@ -208,7 +208,7 @@ void KisLayerBox::slotLayerAdded(KisLayerSP layer)
     }
     else
     {
-        KisPopulateVisitor visitor(static_cast<KisLayerItem*>(list()->layer(layer->tqparent()->id())));
+        KisPopulateVisitor visitor(static_cast<KisLayerItem*>(list()->layer(layer->parent()->id())));
         layer->accept(visitor);
         layersAdded = visitor.layersAdded();
     }
@@ -229,8 +229,8 @@ void KisLayerBox::slotLayerRemoved(KisLayerSP layer, KisGroupLayerSP wasParent,
 
 void KisLayerBox::slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, KisLayerSP)
 {
-    int parentID = layer->tqparent()->id();
-    if (layer->tqparent() == m_image->rootLayer())
+    int parentID = layer->parent()->id();
+    if (layer->parent() == m_image->rootLayer())
         parentID = -1;
 
     int siblingID = -1;
@@ -239,7 +239,7 @@ void KisLayerBox::slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, Ki
 
     list()->moveLayer(layer->id(), parentID, siblingID);
 
-    markModified(layer->tqparent());
+    markModified(layer->parent());
     markModified(wasParent);
     updateUI();
 }
@@ -302,16 +302,16 @@ void KisLayerBox::slotLayerPropertyChanged(LayerItem* item, const TQString& name
 void KisLayerBox::slotLayerMoved(LayerItem* item, LayerItem*, LayerItem*)
 {
     KisLayerSP layer = m_image->findLayer(item->id());
-    KisGroupLayerSP tqparent;
-    if( item->tqparent() )
-        tqparent = dynamic_cast<KisGroupLayer*>(m_image->findLayer(item->tqparent()->id()).data());
-    if( !tqparent )
-        tqparent = m_image->rootLayer();
+    KisGroupLayerSP parent;
+    if( item->parent() )
+        parent = dynamic_cast<KisGroupLayer*>(m_image->findLayer(item->parent()->id()).data());
+    if( !parent )
+        parent = m_image->rootLayer();
     KisLayerSP above = 0;
     if (item->nextSibling())
         above = m_image->findLayer(item->nextSibling()->id());
     if (layer)
-        m_image->moveLayer(layer, tqparent.data(), above);
+        m_image->moveLayer(layer, parent.data(), above);
     updateUI();
 }
 
@@ -320,7 +320,7 @@ void KisLayerBox::slotRequestNewLayer(LayerItem* p, LayerItem* after)
     KisLayer* l = m_image->rootLayer().data();
     if (p)
         l = m_image->findLayer(p->id()).data();
-    KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l);
+    KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l);
 
     KisLayerSP above = 0;
     if (after && after->nextSibling())
@@ -328,10 +328,10 @@ void KisLayerBox::slotRequestNewLayer(LayerItem* p, LayerItem* after)
     else if (after)
         above = 0;
     else if (p && p->firstChild())
-        above = tqparent->firstChild();
+        above = parent->firstChild();
     else if (!p && m_image->rootLayer()->childCount())
         above = m_image->rootLayer()->firstChild();
-    emit sigRequestLayer(tqparent, above);
+    emit sigRequestLayer(parent, above);
 }
 
 void KisLayerBox::slotRequestNewFolder(LayerItem* p, LayerItem* after)
@@ -339,7 +339,7 @@ void KisLayerBox::slotRequestNewFolder(LayerItem* p, LayerItem* after)
     KisLayer* l = m_image->rootLayer().data(); //FIXME I hate copy-pasting like this.
     if (p)
         l = m_image->findLayer(p->id()).data();
-    KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l);
+    KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l);
 
     KisLayerSP above = 0;
     if (after && after->nextSibling())
@@ -347,10 +347,10 @@ void KisLayerBox::slotRequestNewFolder(LayerItem* p, LayerItem* after)
     else if (after)
         above = 0;
     else if (p && p->firstChild())
-        above = tqparent->firstChild();
+        above = parent->firstChild();
     else if (!p && m_image->rootLayer()->childCount())
         above = m_image->rootLayer()->firstChild();
-    emit sigRequestGroupLayer(tqparent, above);
+    emit sigRequestGroupLayer(parent, above);
 }
 
 void KisLayerBox::slotRequestNewAdjustmentLayer(LayerItem* p, LayerItem* after)
@@ -358,7 +358,7 @@ void KisLayerBox::slotRequestNewAdjustmentLayer(LayerItem* p, LayerItem* after)
     KisLayer* l = m_image->rootLayer().data(); //FIXME here too.
     if (p)
         l = m_image->findLayer(p->id()).data();
-    KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l);
+    KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l);
 
     KisLayerSP above = 0;
     if (after && after->nextSibling())
@@ -366,10 +366,10 @@ void KisLayerBox::slotRequestNewAdjustmentLayer(LayerItem* p, LayerItem* after)
     else if (after)
         above = 0;
     else if (p && p->firstChild())
-        above = tqparent->firstChild();
+        above = parent->firstChild();
     else if (!p && m_image->rootLayer()->childCount())
         above = m_image->rootLayer()->firstChild();
-    emit sigRequestAdjustmentLayer(tqparent, above);
+    emit sigRequestAdjustmentLayer(parent, above);
 }
 
 void KisLayerBox::slotRequestNewObjectLayer(LayerItem* p, LayerItem* after, const KoDocumentEntry& entry)
@@ -377,7 +377,7 @@ void KisLayerBox::slotRequestNewObjectLayer(LayerItem* p, LayerItem* after, cons
     KisLayer* l = m_image->rootLayer().data(); //FIXME and here.
     if (p)
         l = m_image->findLayer(p->id()).data();
-    KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l);
+    KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l);
 
     KisLayerSP above = 0;
     if (after && after->nextSibling())
@@ -385,10 +385,10 @@ void KisLayerBox::slotRequestNewObjectLayer(LayerItem* p, LayerItem* after, cons
     else if (after)
         above = 0;
     else if (p && p->firstChild())
-        above = tqparent->firstChild();
+        above = parent->firstChild();
     else if (!p && m_image->rootLayer()->childCount())
         above = m_image->rootLayer()->firstChild();
-    emit sigRequestPartLayer(tqparent, above, entry);
+    emit sigRequestPartLayer(parent, above, entry);
 }
 
 void KisLayerBox::slotRequestRemoveLayer(LayerItem* item)
@@ -410,7 +410,7 @@ void KisLayerBox::slotRequestLayerProperties(LayerItem* item)
 void KisLayerBox::updateUI()
 {
     m_lst->bnDelete->setEnabled(list()->activeLayer());
-    m_lst->bnRaise->setEnabled(list()->activeLayer() && (list()->activeLayer()->prevSibling() || list()->activeLayer()->tqparent()));
+    m_lst->bnRaise->setEnabled(list()->activeLayer() && (list()->activeLayer()->prevSibling() || list()->activeLayer()->parent()));
     m_lst->bnLower->setEnabled(list()->activeLayer() && list()->activeLayer()->nextSibling());
     m_lst->intOpacity->setEnabled(list()->activeLayer());
     m_lst->cmbComposite->setEnabled(list()->activeLayer());
@@ -464,35 +464,35 @@ void KisLayerBox::slotAddMenuActivated(int type)
         return;
 
     KisGroupLayerSP root = m_image->rootLayer();
-    KisGroupLayerSP tqparent;
+    KisGroupLayerSP parent;
     KisLayerSP above;
     if (KisLayerSP active = m_image->activeLayer())
     {
-        tqparent = root;
+        parent = root;
         above = active;
-        if (active->tqparent())
-            tqparent = active->tqparent();
+        if (active->parent())
+            parent = active->parent();
     }
     else
     {
-        tqparent = root;
+        parent = root;
         above = m_image->rootLayer()->firstChild();
     }
 
     switch (type)
     {
         case PAINT_LAYER:
-            emit sigRequestLayer(tqparent, above);
+            emit sigRequestLayer(parent, above);
             break;
         case GROUP_LAYER:
-            emit sigRequestGroupLayer(tqparent, above);
+            emit sigRequestGroupLayer(parent, above);
             break;
         case ADJUSTMENT_LAYER:
-            emit sigRequestAdjustmentLayer(tqparent, above);
+            emit sigRequestAdjustmentLayer(parent, above);
             break;
         case OBJECT_LAYER:
         default: //goddamned TQt doesn't emit activated for default-assigned IDs, so this does nothing
-            emit sigRequestPartLayer(tqparent, above, m_partLayerAction->documentEntry());
+            emit sigRequestPartLayer(parent, above, m_partLayerAction->documentEntry());
     }
 }
 
@@ -522,17 +522,17 @@ void KisLayerBox::slotRaiseClicked()
     }
 
     KisLayerSP layer = m_image->findLayer(l.first());
-    if( l.count() == 1 && layer == layer->tqparent()->firstChild() && layer->tqparent() != m_image->rootLayer())
+    if( l.count() == 1 && layer == layer->parent()->firstChild() && layer->parent() != m_image->rootLayer())
     {
-        if (KisGroupLayerSP grandtqparent = layer->tqparent()->tqparent())
-            m_image->moveLayer(layer, grandtqparent, layer->tqparent().data());
+        if (KisGroupLayerSP grandparent = layer->parent()->parent())
+            m_image->moveLayer(layer, grandparent, layer->parent().data());
     }
     else
     {
         for (int i = 0, n = l.count(); i < n; ++i)
             if (KisLayerSP li = m_image->findLayer(l[i]))
                 if (li->prevSibling())
-                    m_image->moveLayer(li, li->tqparent(), li->prevSibling());
+                    m_image->moveLayer(li, li->parent(), li->prevSibling());
     }
 
     if( !l.isEmpty() )
@@ -551,7 +551,7 @@ void KisLayerBox::slotLowerClicked()
     for (int i = l.count() - 1; i >= 0; --i)
         if (LayerItem *layer = l[i])
             if (layer->nextSibling())
-                list()->moveLayer(layer, layer->tqparent(), layer->nextSibling());
+                list()->moveLayer(layer, layer->parent(), layer->nextSibling());
 
     if( !l.isEmpty() )
         list()->ensureItemVisible( l.last() );
@@ -609,7 +609,7 @@ void KisLayerBox::markModified(KisLayer* layer)
     while (layer && layer != m_image->rootLayer().data())
     {
         v.append(layer->id());
-        layer = layer->tqparent();
+        layer = layer->parent();
     }
     for (int i = v.count() - 1; i >= 0; --i)
         if (!m_modified.contains(v[i]))
@@ -636,7 +636,7 @@ void KisLayerBox::printChalkLayers() const
         root = layer;
         printChalkLayers();
         indent -= 2;
-        root = layer->tqparent();
+        root = layer->parent();
     }
 }
 
@@ -652,7 +652,7 @@ void KisLayerBox::printLayerboxLayers() const
             root = layer;
             printLayerboxLayers();
             indent -= 2;
-            root = layer->tqparent();
+            root = layer->parent();
         }
         return;
     }
@@ -668,7 +668,7 @@ void KisLayerBox::printLayerboxLayers() const
         root = layer;
         printLayerboxLayers();
         indent -= 2;
-        root = layer->tqparent();
+        root = layer->parent();
     }
 }
 
diff --git a/chalk/ui/kis_layerbox.h b/chalk/ui/kis_layerbox.h
index c9d14a881..776f7fe27 100644
--- a/chalk/ui/kis_layerbox.h
+++ b/chalk/ui/kis_layerbox.h
@@ -47,7 +47,7 @@ class KisLayerBox : public TQFrame {
   TQ_OBJECT
 
 public:
-    KisLayerBox(KisCanvasSubject *subject, TQWidget *tqparent = 0, const char *name = 0);
+    KisLayerBox(KisCanvasSubject *subject, TQWidget *parent = 0, const char *name = 0);
     virtual ~KisLayerBox();
 
     void clear();
@@ -69,10 +69,10 @@ public slots:
     void slotSetColorSpace(const KisColorSpace * colorSpace);
 
 signals:
-    void sigRequestLayer(KisGroupLayerSP tqparent, KisLayerSP above);
-    void sigRequestGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above);
-    void sigRequestAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above);
-    void sigRequestPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry);
+    void sigRequestLayer(KisGroupLayerSP parent, KisLayerSP above);
+    void sigRequestGroupLayer(KisGroupLayerSP parent, KisLayerSP above);
+    void sigRequestAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above);
+    void sigRequestPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry);
     void sigRequestLayerProperties(KisLayerSP layer);
 
     void sigOpacityChanged(int opacity, bool withSlider);
@@ -87,11 +87,11 @@ private slots:
     void slotLayerActivated(LayerItem* layer);
     void slotLayerDisplayNameChanged(LayerItem* layer, const TQString& displayName);
     void slotLayerPropertyChanged(LayerItem* layer, const TQString& name, bool on);
-    void slotLayerMoved(LayerItem* layer, LayerItem* tqparent, LayerItem* after);
-    void slotRequestNewLayer(LayerItem* tqparent, LayerItem* after);
-    void slotRequestNewFolder(LayerItem* tqparent, LayerItem* after);
-    void slotRequestNewAdjustmentLayer(LayerItem* tqparent, LayerItem* after);
-    void slotRequestNewObjectLayer(LayerItem* tqparent, LayerItem* item, const KoDocumentEntry& entry);
+    void slotLayerMoved(LayerItem* layer, LayerItem* parent, LayerItem* after);
+    void slotRequestNewLayer(LayerItem* parent, LayerItem* after);
+    void slotRequestNewFolder(LayerItem* parent, LayerItem* after);
+    void slotRequestNewAdjustmentLayer(LayerItem* parent, LayerItem* after);
+    void slotRequestNewObjectLayer(LayerItem* parent, LayerItem* item, const KoDocumentEntry& entry);
     void slotRequestRemoveLayer(LayerItem* layer);
     void slotRequestLayerProperties(LayerItem* layer);
 
diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc
index 64127d20d..985bd0c69 100644
--- a/chalk/ui/kis_layerlist.cc
+++ b/chalk/ui/kis_layerlist.cc
@@ -35,8 +35,8 @@
 #include "kis_layerlist.h"
 
 
-KisLayerList::KisLayerList( TQWidget *tqparent, const char *name )
-    : super( tqparent, name )
+KisLayerList::KisLayerList( TQWidget *parent, const char *name )
+    : super( parent, name )
 {
     m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", TQT_TQOBJECT(this) );
 }
@@ -76,26 +76,26 @@ void KisLayerList::constructMenu( LayerItem *layer )
 void KisLayerList::menuActivated( int id, LayerItem *layer )
 {
     const TQValueList<LayerItem*> selected = selectedLayers();
-    LayerItem *tqparent = ( layer && layer->isFolder() ) ? layer : 0;
+    LayerItem *parent = ( layer && layer->isFolder() ) ? layer : 0;
     LayerItem *after = 0;
-    if( layer && !tqparent )
+    if( layer && !parent )
     {
-        tqparent = layer->tqparent();
+        parent = layer->parent();
         after = layer->prevSibling();
     }
     switch( id )
     {
         case MenuItems::NewLayer:
-            emit requestNewLayer( tqparent, after );
-            emit requestNewLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1 );
+            emit requestNewLayer( parent, after );
+            emit requestNewLayer( parent ? parent->id() : -1, after ? after->id() : -1 );
             break;
         case MenuItems::NewFolder:
-            emit requestNewFolder( tqparent, after );
-            emit requestNewFolder( tqparent ? tqparent->id() : -1, after ? after->id() : -1 );
+            emit requestNewFolder( parent, after );
+            emit requestNewFolder( parent ? parent->id() : -1, after ? after->id() : -1 );
             break;
         case ADJUSTMENT_LAYER:
-            emit requestNewAdjustmentLayer( tqparent, after );
-            emit requestNewAdjustmentLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1 );
+            emit requestNewAdjustmentLayer( parent, after );
+            emit requestNewAdjustmentLayer( parent ? parent->id() : -1, after ? after->id() : -1 );
             break;
         case MenuItems::RemoveLayer:
             {
@@ -123,26 +123,26 @@ void KisLayerList::menuActivated( int id, LayerItem *layer )
                 super::menuActivated( id, layer );
             else if( id != -1 ) //object layer was selected
             {
-                emit requestNewObjectLayer( tqparent, after, m_partLayerAction->documentEntry() );
-                emit requestNewObjectLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1, m_partLayerAction->documentEntry() );
+                emit requestNewObjectLayer( parent, after, m_partLayerAction->documentEntry() );
+                emit requestNewObjectLayer( parent ? parent->id() : -1, after ? after->id() : -1, m_partLayerAction->documentEntry() );
             }
     }
 }
 
-KisLayerItem::KisLayerItem( LayerList* tqparent, KisLayer* layer )
+KisLayerItem::KisLayerItem( LayerList* parent, KisLayer* layer )
     : super( layer->name(),
-             tqparent,
-             layer->prevSibling() ? tqparent->layer( layer->prevSibling()->id() ) : 0,
+             parent,
+             layer->prevSibling() ? parent->layer( layer->prevSibling()->id() ) : 0,
              layer->id() )
     , m_layer( layer )
 {
     init();
 }
 
-KisLayerItem::KisLayerItem( LayerItem* tqparent, KisLayer* layer )
+KisLayerItem::KisLayerItem( LayerItem* parent, KisLayer* layer )
     : super( layer->name(),
-             tqparent,
-             layer->prevSibling() ? tqparent->listView()->layer( layer->prevSibling()->id() ) : 0,
+             parent,
+             layer->prevSibling() ? parent->listView()->layer( layer->prevSibling()->id() ) : 0,
              layer->id() )
     , m_layer( layer )
 {
diff --git a/chalk/ui/kis_layerlist.h b/chalk/ui/kis_layerlist.h
index 5b74acea4..c8a2c18ca 100644
--- a/chalk/ui/kis_layerlist.h
+++ b/chalk/ui/kis_layerlist.h
@@ -34,13 +34,13 @@ class KisLayerList: public LayerList
     typedef LayerList super;
 
 signals:
-    void requestNewObjectLayer( LayerItem *tqparent, LayerItem *after, const KoDocumentEntry &entry );
+    void requestNewObjectLayer( LayerItem *parent, LayerItem *after, const KoDocumentEntry &entry );
     void requestNewObjectLayer( int parentID, int afterID, const KoDocumentEntry &entry );
-    void requestNewAdjustmentLayer( LayerItem *tqparent, LayerItem *after );
+    void requestNewAdjustmentLayer( LayerItem *parent, LayerItem *after );
     void requestNewAdjustmentLayer( int parentID, int afterID );
 
 public:
-    KisLayerList( TQWidget *tqparent = 0, const char *name = 0 );
+    KisLayerList( TQWidget *parent = 0, const char *name = 0 );
 
     virtual void constructMenu( LayerItem *layer );
     virtual void menuActivated( int id, LayerItem *layer );
@@ -56,8 +56,8 @@ class KisLayerItem: public LayerItem
     typedef LayerItem super;
 
 public:
-    KisLayerItem( LayerList* tqparent, KisLayer* layer );
-    KisLayerItem( LayerItem* tqparent, KisLayer* layer );
+    KisLayerItem( LayerList* parent, KisLayer* layer );
+    KisLayerItem( LayerItem* parent, KisLayer* layer );
 
     KisLayer* layer() const;
 
diff --git a/chalk/ui/kis_load_visitor.h b/chalk/ui/kis_load_visitor.h
index 1997d3bc3..bdac5e82b 100644
--- a/chalk/ui/kis_load_visitor.h
+++ b/chalk/ui/kis_load_visitor.h
@@ -88,16 +88,16 @@ public:
             kdDebug(DBG_AREA_FILE) << "Opened icc information, size is " << data.size() << endl;
         }
 
-        // tqmask
+        // mask
         if (layer->hasMask()) { // We set this in KisDoc::loadPaintLayer
-            KisPaintDeviceSP tqmask = layer->getMask();
+            KisPaintDeviceSP mask = layer->getMask();
             location = m_external ? TQString() : m_uri;
-            location += m_img->name() + "/layers/" + m_layerFilenames[layer] + ".tqmask";
+            location += m_img->name() + "/layers/" + m_layerFilenames[layer] + ".mask";
 
             // Layer data
             if (m_store->open(location)) {
-                if (!tqmask->read(m_store)) {
-                    tqmask->disconnect();
+                if (!mask->read(m_store)) {
+                    mask->disconnect();
                     m_store->close();
                     //IODone();
                     return false;
diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cc
index 2507f1fb2..806998bf7 100644
--- a/chalk/ui/kis_multi_bool_filter_widget.cc
+++ b/chalk/ui/kis_multi_bool_filter_widget.cc
@@ -32,8 +32,8 @@ KisBoolWidgetParam::KisBoolWidgetParam(  bool ninitvalue, TQString nlabel, TQStr
 
 }
 
-KisMultiBoolFilterWidget::KisMultiBoolFilterWidget(TQWidget * tqparent, const char * name, const char * caption, vKisBoolWidgetParam iwparam) : 
-    KisFilterConfigWidget( tqparent, name )
+KisMultiBoolFilterWidget::KisMultiBoolFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisBoolWidgetParam iwparam) : 
+    KisFilterConfigWidget( parent, name )
 {
     TQ_INT32 m_nbboolWidgets = iwparam.size();
 
diff --git a/chalk/ui/kis_multi_bool_filter_widget.h b/chalk/ui/kis_multi_bool_filter_widget.h
index 0e719beef..81d626fa0 100644
--- a/chalk/ui/kis_multi_bool_filter_widget.h
+++ b/chalk/ui/kis_multi_bool_filter_widget.h
@@ -43,7 +43,7 @@ class KRITA_EXPORT KisMultiBoolFilterWidget : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisMultiBoolFilterWidget(TQWidget * tqparent,  const char * name, const char *caption, vKisBoolWidgetParam iwparam);
+    KisMultiBoolFilterWidget(TQWidget * parent,  const char * name, const char *caption, vKisBoolWidgetParam iwparam);
     virtual void setConfiguration(KisFilterConfiguration * cfg);
 public:
     inline TQ_INT32 nbValues() { return m_nbboolWidgets; };
diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cc
index 9b5d453ba..486bc7701 100644
--- a/chalk/ui/kis_multi_double_filter_widget.cc
+++ b/chalk/ui/kis_multi_double_filter_widget.cc
@@ -26,8 +26,8 @@
 #include <kis_filter_config_widget.h>
 #include <klocale.h>
 
-KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * tqparent, const char * name)
-    : KDoubleNumInput(tqparent, name)
+KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * parent, const char * name)
+    : KDoubleNumInput(parent, name)
 {
     m_timer = new TQTimer(this, name);
     connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotValueChanged()));
@@ -59,8 +59,8 @@ KisDoubleWidgetParam::KisDoubleWidgetParam(double nmin, double nmax, double nini
 
 }
 
-KisMultiDoubleFilterWidget::KisMultiDoubleFilterWidget(TQWidget * tqparent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam)
-    : KisFilterConfigWidget( tqparent, name )
+KisMultiDoubleFilterWidget::KisMultiDoubleFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam)
+    : KisFilterConfigWidget( parent, name )
 {
     TQ_INT32 m_nbdoubleWidgets = dwparam.size();
 
diff --git a/chalk/ui/kis_multi_double_filter_widget.h b/chalk/ui/kis_multi_double_filter_widget.h
index 5351745e5..ee3a3dcf3 100644
--- a/chalk/ui/kis_multi_double_filter_widget.h
+++ b/chalk/ui/kis_multi_double_filter_widget.h
@@ -32,7 +32,7 @@ class KisDelayedActionDoubleInput : public KDoubleNumInput
             
     public:
         
-        KisDelayedActionDoubleInput(TQWidget * tqparent, const char * name);
+        KisDelayedActionDoubleInput(TQWidget * parent, const char * name);
 
         void cancelDelayedSignal();
 
@@ -66,7 +66,7 @@ class KRITA_EXPORT KisMultiDoubleFilterWidget : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisMultiDoubleFilterWidget(TQWidget * tqparent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam);
+    KisMultiDoubleFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam);
     virtual void setConfiguration(KisFilterConfiguration * cfg);
 public:
     inline TQ_INT32 nbValues() { return m_nbdoubleWidgets; };
diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cc
index 07bfbe2aa..130a03d10 100644
--- a/chalk/ui/kis_multi_integer_filter_widget.cc
+++ b/chalk/ui/kis_multi_integer_filter_widget.cc
@@ -25,8 +25,8 @@
 #include <knuminput.h>
 #include <klocale.h>
 
-KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * tqparent, const char * name)
-        : KIntNumInput(tqparent, name)
+KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * parent, const char * name)
+        : KIntNumInput(parent, name)
 {
         m_timer = new TQTimer(this, name);
         connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotValueChanged()));
@@ -57,11 +57,11 @@ KisIntegerWidgetParam::KisIntegerWidgetParam(  TQ_INT32 nmin, TQ_INT32 nmax, TQ_
 {
 }
 
-KisMultiIntegerFilterWidget::KisMultiIntegerFilterWidget(TQWidget * tqparent,
+KisMultiIntegerFilterWidget::KisMultiIntegerFilterWidget(TQWidget * parent,
                                                          const char * name,
                                                          const char * caption,
                                                          vKisIntegerWidgetParam iwparam)
-    : KisFilterConfigWidget( tqparent, name )
+    : KisFilterConfigWidget( parent, name )
 {
     m_nbintegerWidgets = iwparam.size();
     this->setCaption(caption);
diff --git a/chalk/ui/kis_multi_integer_filter_widget.h b/chalk/ui/kis_multi_integer_filter_widget.h
index a08f4cadc..c40b74a15 100644
--- a/chalk/ui/kis_multi_integer_filter_widget.h
+++ b/chalk/ui/kis_multi_integer_filter_widget.h
@@ -33,7 +33,7 @@ class KisDelayedActionIntegerInput : public KIntNumInput
             
 public:
         
-    KisDelayedActionIntegerInput(TQWidget * tqparent, const char * name);
+    KisDelayedActionIntegerInput(TQWidget * parent, const char * name);
 
     void cancelDelayedSignal();
 
@@ -67,7 +67,7 @@ class KRITA_EXPORT KisMultiIntegerFilterWidget : public KisFilterConfigWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisMultiIntegerFilterWidget(TQWidget * tqparent,  const char * name, const char *caption, vKisIntegerWidgetParam iwparam);
+    KisMultiIntegerFilterWidget(TQWidget * parent,  const char * name, const char *caption, vKisIntegerWidgetParam iwparam);
 
     virtual void setConfiguration(KisFilterConfiguration * config);
     
diff --git a/chalk/ui/kis_opengl_canvas.cc b/chalk/ui/kis_opengl_canvas.cc
index ef8f743e8..82363a0b8 100644
--- a/chalk/ui/kis_opengl_canvas.cc
+++ b/chalk/ui/kis_opengl_canvas.cc
@@ -21,8 +21,8 @@
 #include "kis_opengl_canvas_painter.h"
 
 #ifdef HAVE_GL
-KisOpenGLCanvasWidget::KisOpenGLCanvasWidget(TQWidget *tqparent, const char *name, TQGLWidget *sharedContextWidget)
-    : TQGLWidget(KisOpenGLCanvasFormat, tqparent, name, sharedContextWidget)
+KisOpenGLCanvasWidget::KisOpenGLCanvasWidget(TQWidget *parent, const char *name, TQGLWidget *sharedContextWidget)
+    : TQGLWidget(KisOpenGLCanvasFormat, parent, name, sharedContextWidget)
 {
     if (isSharing()) {
         kdDebug(41001) << "Created TQGLWidget with sharing\n";
diff --git a/chalk/ui/kis_opengl_canvas.h b/chalk/ui/kis_opengl_canvas.h
index 8ca2b1e36..99a67b09e 100644
--- a/chalk/ui/kis_opengl_canvas.h
+++ b/chalk/ui/kis_opengl_canvas.h
@@ -43,7 +43,7 @@
 
 class KisOpenGLCanvasWidget : public virtual TQGLWidget, public virtual KisCanvasWidget {
 public:
-    KisOpenGLCanvasWidget(TQWidget *tqparent, const char *name, TQGLWidget *sharedContextWidget);
+    KisOpenGLCanvasWidget(TQWidget *parent, const char *name, TQGLWidget *sharedContextWidget);
     ~KisOpenGLCanvasWidget();
 
     virtual KisCanvasWidgetPainter *createPainter();
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index ad4dbabb3..e0fc1dc88 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -43,8 +43,8 @@
 
 #include "kis_paintop_box.h"
 
-KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *tqparent, const char * name)
-    : super (tqparent, name),
+KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * name)
+    : super (parent, name),
       m_canvasController(view->getCanvasController())
 {
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,90)
diff --git a/chalk/ui/kis_paintop_box.h b/chalk/ui/kis_paintop_box.h
index 90238c78f..400c087c3 100644
--- a/chalk/ui/kis_paintop_box.h
+++ b/chalk/ui/kis_paintop_box.h
@@ -55,7 +55,7 @@ class KisPaintopBox : public TQWidget {
     typedef TQWidget super;
 
 public:
-    KisPaintopBox (KisView * view,  TQWidget * tqparent, const char * name = 0);
+    KisPaintopBox (KisView * view,  TQWidget * parent, const char * name = 0);
 
     ~KisPaintopBox();
 
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc
index dfc75eb4b..a424d9acc 100644
--- a/chalk/ui/kis_palette_view.cc
+++ b/chalk/ui/kis_palette_view.cc
@@ -62,8 +62,8 @@
 #include "kis_resource.h"
 #include "kis_palette.h"
 
-KisPaletteView::KisPaletteView(TQWidget *tqparent, const char* name, int minWidth, int cols)
-    : TQScrollView( tqparent, name ), mMinWidth(minWidth), mCols(cols)
+KisPaletteView::KisPaletteView(TQWidget *parent, const char* name, int minWidth, int cols)
+    : TQScrollView( parent, name ), mMinWidth(minWidth), mCols(cols)
 {
     m_cells = 0;
     m_currentPalette = 0;
diff --git a/chalk/ui/kis_palette_view.h b/chalk/ui/kis_palette_view.h
index 79b3e0b0e..e82b66c06 100644
--- a/chalk/ui/kis_palette_view.h
+++ b/chalk/ui/kis_palette_view.h
@@ -37,7 +37,7 @@ class KisPaletteView : public TQScrollView
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisPaletteView(TQWidget *tqparent, const char* name = 0, int minWidth=210, int cols = 16);
+    KisPaletteView(TQWidget *parent, const char* name = 0, int minWidth=210, int cols = 16);
     virtual ~KisPaletteView();
 
     KisPalette* palette() const;
diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc
index a83053378..2feb74c81 100644
--- a/chalk/ui/kis_palette_widget.cc
+++ b/chalk/ui/kis_palette_widget.cc
@@ -60,8 +60,8 @@
 #include "kis_palette.h"
 #include "kis_palette_view.h"
 
-KisPaletteWidget::KisPaletteWidget( TQWidget *tqparent, int minWidth, int cols)
-    : TQWidget( tqparent ), mMinWidth(minWidth), mCols(cols)
+KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols)
+    : TQWidget( parent ), mMinWidth(minWidth), mCols(cols)
 {
     init = false;
 
diff --git a/chalk/ui/kis_palette_widget.h b/chalk/ui/kis_palette_widget.h
index 6323b0a7d..6ea62019c 100644
--- a/chalk/ui/kis_palette_widget.h
+++ b/chalk/ui/kis_palette_widget.h
@@ -41,7 +41,7 @@ class KisPaletteWidget : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KisPaletteWidget( TQWidget *tqparent, int minWidth=210, int cols = 16);
+    KisPaletteWidget( TQWidget *parent, int minWidth=210, int cols = 16);
     virtual ~KisPaletteWidget();
 
     TQString palette() const;
diff --git a/chalk/ui/kis_part_layer.h b/chalk/ui/kis_part_layer.h
index 650261391..d2ff10eb2 100644
--- a/chalk/ui/kis_part_layer.h
+++ b/chalk/ui/kis_part_layer.h
@@ -46,7 +46,7 @@ public:
 
     virtual ~KisChildDoc();
 
-    KisDoc * tqparent() const { return m_doc; }
+    KisDoc * parent() const { return m_doc; }
 
     void setPartLayer (KisPartLayerSP layer) { m_partLayer = layer; }
 
diff --git a/chalk/ui/kis_part_layer_handler.cc b/chalk/ui/kis_part_layer_handler.cc
index f062e4a1a..d44f928a8 100644
--- a/chalk/ui/kis_part_layer_handler.cc
+++ b/chalk/ui/kis_part_layer_handler.cc
@@ -31,8 +31,8 @@
 #include "kis_part_layer_handler.h"
 
 KisPartLayerHandler::KisPartLayerHandler(KisView* view, const KoDocumentEntry& entry,
-                                         KisGroupLayerSP tqparent, KisLayerSP above)
-    : m_parent(tqparent), m_above(above), m_view(view), m_entry(entry) {
+                                         KisGroupLayerSP parent, KisLayerSP above)
+    : m_parent(parent), m_above(above), m_view(view), m_entry(entry) {
     m_started = false;
     view->getCanvasController()->setCanvasCursor( KisCursor::selectCursor() );
 }
diff --git a/chalk/ui/kis_part_layer_handler.h b/chalk/ui/kis_part_layer_handler.h
index 746b23d97..ad21f8680 100644
--- a/chalk/ui/kis_part_layer_handler.h
+++ b/chalk/ui/kis_part_layer_handler.h
@@ -32,7 +32,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
     KisPartLayerHandler(KisView* view, const KoDocumentEntry& entry,
-                        KisGroupLayerSP tqparent, KisLayerSP above);
+                        KisGroupLayerSP parent, KisLayerSP above);
 signals:
     void sigGotMoveEvent(KisMoveEvent* event);
     void sigGotKeyPressEvent(TQKeyEvent* event);
diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc
index f19200bfe..70484b0a3 100644
--- a/chalk/ui/kis_pattern_chooser.cc
+++ b/chalk/ui/kis_pattern_chooser.cc
@@ -26,7 +26,7 @@
 #include "kis_icon_item.h"
 #include "kis_pattern.h"
 
-KisPatternChooser::KisPatternChooser(TQWidget *tqparent, const char *name) : super(tqparent, name)
+KisPatternChooser::KisPatternChooser(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_lbName = new TQLabel(this);
 
diff --git a/chalk/ui/kis_pattern_chooser.h b/chalk/ui/kis_pattern_chooser.h
index b7a61080a..284bd8e15 100644
--- a/chalk/ui/kis_pattern_chooser.h
+++ b/chalk/ui/kis_pattern_chooser.h
@@ -28,7 +28,7 @@ class KisPatternChooser : public KisItemChooser {
   TQ_OBJECT
 
 public:
-    KisPatternChooser(TQWidget *tqparent = 0, const char *name = 0);
+    KisPatternChooser(TQWidget *parent = 0, const char *name = 0);
     virtual ~KisPatternChooser();
 
 protected:
diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp
index c454af801..6c326a3c6 100644
--- a/chalk/ui/kis_perspective_grid_manager.cpp
+++ b/chalk/ui/kis_perspective_grid_manager.cpp
@@ -29,10 +29,10 @@
 #include "kis_perspective_grid.h"
 #include "kis_view.h"
 
-KisPerspectiveGridManager::KisPerspectiveGridManager(KisView * tqparent)
+KisPerspectiveGridManager::KisPerspectiveGridManager(KisView * parent)
     : TQObject()
     , m_toggleEdition(false)
-    , m_view(tqparent)
+    , m_view(parent)
 {
     
 }
diff --git a/chalk/ui/kis_perspective_grid_manager.h b/chalk/ui/kis_perspective_grid_manager.h
index 85954ba49..11875587d 100644
--- a/chalk/ui/kis_perspective_grid_manager.h
+++ b/chalk/ui/kis_perspective_grid_manager.h
@@ -33,7 +33,7 @@ class KisPerspectiveGridManager : public TQObject
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisPerspectiveGridManager(KisView * tqparent);
+        KisPerspectiveGridManager(KisView * parent);
         ~KisPerspectiveGridManager();
         void setup(KActionCollection * collection);
         void drawGrid(TQRect wr, TQPainter *p, bool openGL = false);
diff --git a/chalk/ui/kis_populate_visitor.h b/chalk/ui/kis_populate_visitor.h
index d228137ac..ee43e825b 100644
--- a/chalk/ui/kis_populate_visitor.h
+++ b/chalk/ui/kis_populate_visitor.h
@@ -41,9 +41,9 @@ class KisPopulateVisitor: public KisLayerVisitor
             , m_parent(0)
             { }
 
-        KisPopulateVisitor(KisLayerItem* tqparent)
-            : m_widget(tqparent->listView())
-            , m_parent(tqparent)
+        KisPopulateVisitor(KisLayerItem* parent)
+            : m_widget(parent->listView())
+            , m_parent(parent)
             { }
 
         virtual bool visit(KisPaintLayer* layer)
diff --git a/chalk/ui/kis_previewdialog.cc b/chalk/ui/kis_previewdialog.cc
index fdeb872a8..e2857c192 100644
--- a/chalk/ui/kis_previewdialog.cc
+++ b/chalk/ui/kis_previewdialog.cc
@@ -25,8 +25,8 @@
 #include "kis_previewwidget.h"
 #include "kis_previewdialog.h"
 
-KisPreviewDialog::KisPreviewDialog( TQWidget *  tqparent, const char * name, bool modal, const TQString &caption)
-    : super (tqparent, name, modal, caption, Ok | Cancel, Ok)
+KisPreviewDialog::KisPreviewDialog( TQWidget *  parent, const char * name, bool modal, const TQString &caption)
+    : super (parent, name, modal, caption, Ok | Cancel, Ok)
 {
     TQHBox* tqlayout = new TQHBox(this);
     tqlayout->setSpacing( 6 );
diff --git a/chalk/ui/kis_previewdialog.h b/chalk/ui/kis_previewdialog.h
index 9f268d449..68f8153d9 100644
--- a/chalk/ui/kis_previewdialog.h
+++ b/chalk/ui/kis_previewdialog.h
@@ -32,7 +32,7 @@ class KisPreviewDialog: public KDialogBase {
   TQ_OBJECT
 
 public:
-    KisPreviewDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, const TQString &caption=TQString());
+    KisPreviewDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, const TQString &caption=TQString());
     ~KisPreviewDialog();
 
     KisPreviewWidget* previewWidget() { return m_preview; }
diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc
index c534384a8..2598e79d3 100644
--- a/chalk/ui/kis_previewwidget.cc
+++ b/chalk/ui/kis_previewwidget.cc
@@ -65,8 +65,8 @@ static const int ZOOM_PAUSE = 100;
 static const int FILTER_PAUSE = 500;
 static const double ZOOM_FACTOR = 1.1;
 
-KisPreviewWidget::KisPreviewWidget( TQWidget* tqparent, const char* name )
-    : PreviewWidgetBase( tqparent, name )
+KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name )
+    : PreviewWidgetBase( parent, name )
     , m_autoupdate(true)
     , m_previewIsDisplayed(true)
     , m_scaledOriginal()
diff --git a/chalk/ui/kis_previewwidget.h b/chalk/ui/kis_previewwidget.h
index bcdf437eb..51592624c 100644
--- a/chalk/ui/kis_previewwidget.h
+++ b/chalk/ui/kis_previewwidget.h
@@ -52,7 +52,7 @@ class KisPreviewWidget : public PreviewWidgetBase
 
 public:
     /** Constructs the widget */
-    KisPreviewWidget( TQWidget* tqparent = 0, const char* name = 0 );
+    KisPreviewWidget( TQWidget* parent = 0, const char* name = 0 );
     virtual ~KisPreviewWidget();
 
     /** returns if the preview is automatically updated */
diff --git a/chalk/ui/kis_qpaintdevice_canvas.cc b/chalk/ui/kis_qpaintdevice_canvas.cc
index 1f7def2d8..e3824f555 100644
--- a/chalk/ui/kis_qpaintdevice_canvas.cc
+++ b/chalk/ui/kis_qpaintdevice_canvas.cc
@@ -23,8 +23,8 @@
 #include "kis_qpaintdevice_canvas_painter.h"
 #include <kdebug.h>
 
-KisTQPaintDeviceCanvasWidget::KisTQPaintDeviceCanvasWidget(TQWidget *tqparent, const char *name)
-    : TQWidget(tqparent, name)
+KisTQPaintDeviceCanvasWidget::KisTQPaintDeviceCanvasWidget(TQWidget *parent, const char *name)
+    : TQWidget(parent, name)
 {
 }
 
diff --git a/chalk/ui/kis_qpaintdevice_canvas.h b/chalk/ui/kis_qpaintdevice_canvas.h
index ae6882483..706cb195e 100644
--- a/chalk/ui/kis_qpaintdevice_canvas.h
+++ b/chalk/ui/kis_qpaintdevice_canvas.h
@@ -39,7 +39,7 @@
 
 class KisTQPaintDeviceCanvasWidget : public virtual TQWidget, public virtual KisCanvasWidget {
 public:
-    KisTQPaintDeviceCanvasWidget(TQWidget *tqparent = 0, const char *name = 0);
+    KisTQPaintDeviceCanvasWidget(TQWidget *parent = 0, const char *name = 0);
     ~KisTQPaintDeviceCanvasWidget();
 
     virtual KisCanvasWidgetPainter *createPainter();
diff --git a/chalk/ui/kis_resource_mediator.cc b/chalk/ui/kis_resource_mediator.cc
index d49938076..c06584c33 100644
--- a/chalk/ui/kis_resource_mediator.cc
+++ b/chalk/ui/kis_resource_mediator.cc
@@ -26,8 +26,8 @@
 #include "kis_resource_mediator.h"
 
 KisResourceMediator::KisResourceMediator(KisItemChooser *chooser,
-                     TQObject *tqparent,
-                     const char *name) : super(tqparent, name), m_chooser(chooser)
+                     TQObject *parent,
+                     const char *name) : super(parent, name), m_chooser(chooser)
 {
     Q_ASSERT(chooser);
     m_activeItem = 0;
diff --git a/chalk/ui/kis_resource_mediator.h b/chalk/ui/kis_resource_mediator.h
index b224d25c2..8c67151d7 100644
--- a/chalk/ui/kis_resource_mediator.h
+++ b/chalk/ui/kis_resource_mediator.h
@@ -41,7 +41,7 @@ class KisResourceMediator : public TQObject {
 
 public:
     KisResourceMediator(KisItemChooser *chooser,
-                TQObject *tqparent = 0,
+                TQObject *parent = 0,
                 const char *name = 0);
     virtual ~KisResourceMediator();
 
diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc
index 6b0eea807..44e86caed 100644
--- a/chalk/ui/kis_ruler.cc
+++ b/chalk/ui/kis_ruler.cc
@@ -40,7 +40,7 @@ const char *KisRuler::m_nums[] = {
     "XX   XXXXXX XXX     XXX   XXXXXX XXX    XXXX   XXXXX XXXXX   XXXX  XXX"
 };
 
-KisRuler::KisRuler(Qt::Orientation o, TQWidget *tqparent, const char *name) : super(tqparent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums)
+KisRuler::KisRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums)
 {
     setBackgroundMode(NoBackground);
     setFrameStyle(Box | Sunken);
diff --git a/chalk/ui/kis_ruler.h b/chalk/ui/kis_ruler.h
index 6c8dd46db..28ab4d826 100644
--- a/chalk/ui/kis_ruler.h
+++ b/chalk/ui/kis_ruler.h
@@ -38,7 +38,7 @@ class KisRuler : public TQFrame {
     typedef TQFrame super;
 
 public:
-    KisRuler(Qt::Orientation, TQWidget *tqparent = 0, const char *name = 0);
+    KisRuler(Qt::Orientation, TQWidget *parent = 0, const char *name = 0);
     virtual ~KisRuler();
 
 public:
diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h
index ce668a531..1205632b0 100644
--- a/chalk/ui/kis_save_visitor.h
+++ b/chalk/ui/kis_save_visitor.h
@@ -80,16 +80,16 @@ public:
         }
 
         if (layer->hasMask()) {
-            KisPaintDeviceSP tqmask = layer->getMask();
+            KisPaintDeviceSP mask = layer->getMask();
 
-            if (tqmask) {
+            if (mask) {
                 // save layer profile
                 location = m_external ? TQString() : m_uri;
-                location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".tqmask";
+                location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".mask";
 
                 if (m_store->open(location)) {
-                    if (!tqmask->write(m_store)) {
-                        tqmask->disconnect();
+                    if (!mask->write(m_store)) {
+                        mask->disconnect();
                         m_store->close();
                         return false;
                     }
diff --git a/chalk/ui/kis_savexml_visitor.h b/chalk/ui/kis_savexml_visitor.h
index 52c0dc808..155807523 100644
--- a/chalk/ui/kis_savexml_visitor.h
+++ b/chalk/ui/kis_savexml_visitor.h
@@ -56,7 +56,7 @@ public:
         layerElement.setAttribute("layertype", "paintlayer");
         layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count));
         layerElement.setAttribute("colorspacename", layer->paintDevice()->colorSpace()->id().id());
-        layerElement.setAttribute("hastqmask", layer->hasMask());
+        layerElement.setAttribute("hasmask", layer->hasMask());
         m_elem.appendChild(layerElement);
 
         if(layer->paintDevice()->hasExifInfo())
diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc
index 3caba5e74..0655b8342 100644
--- a/chalk/ui/kis_selection_manager.cc
+++ b/chalk/ui/kis_selection_manager.cc
@@ -60,8 +60,8 @@
 #include "kis_fill_painter.h"
 #include "kis_canvas.h"
 
-KisSelectionManager::KisSelectionManager(KisView * tqparent, KisDoc * doc)
-    : m_parent(tqparent),
+KisSelectionManager::KisSelectionManager(KisView * parent, KisDoc * doc)
+    : m_parent(parent),
       m_doc(doc),
       m_copy(0),
       m_cut(0),
@@ -258,7 +258,7 @@ void KisSelectionManager::updateGUI()
     Q_ASSERT(m_clipboard);
 
     if (m_parent == 0) {
-        // "Eek, no tqparent!
+        // "Eek, no parent!
         return;
     }
 
@@ -393,7 +393,7 @@ void KisSelectionManager::copy()
     gc.bitBlt(0, 0, COMPOSITE_COPY, dev, r.x(), r.y(), r.width(), r.height());
     gc.end();
 
-    // Apply selection tqmask.
+    // Apply selection mask.
 
     for (TQ_INT32 y = 0; y < r.height(); y++) {
         KisHLineIteratorPixel layerIt = clip->createHLineIterator(0, y, r.width(), true);
@@ -451,7 +451,7 @@ KisLayerSP KisSelectionManager::paste()
                 layer->convertTo(img->colorSpace());
 */
         TQApplication::restoreOverrideCursor();
-        if(img->addLayer(layer, img->activeLayer()->tqparent(), img->activeLayer()))
+        if(img->addLayer(layer, img->activeLayer()->parent(), img->activeLayer()))
         {
           return layer;
         } else {
@@ -833,7 +833,7 @@ void KisSelectionManager::grow (TQ_INT32 xradius, TQ_INT32 yradius)
 
     TQ_UINT8* out = new TQ_UINT8[ layerSize.width() ]; // holds the new scan line we are computing
 
-    TQ_INT32* circ = new TQ_INT32[ 2 * xradius + 1 ]; // holds the y coords of the filter's tqmask
+    TQ_INT32* circ = new TQ_INT32[ 2 * xradius + 1 ]; // holds the y coords of the filter's mask
     computeBorder (circ, xradius, yradius);
 
     /* offset the circ pointer by xradius so the range of the array
@@ -994,7 +994,7 @@ void KisSelectionManager::shrink (TQ_INT32 xradius, TQ_INT32 yradius, bool edge_
 
     TQ_UINT8* out = new TQ_UINT8[layerSize.width()]; // holds the new scan line we are computing
 
-    TQ_INT32* circ = new TQ_INT32[2 * xradius + 1]; // holds the y coords of the filter's tqmask
+    TQ_INT32* circ = new TQ_INT32[2 * xradius + 1]; // holds the y coords of the filter's mask
 
     computeBorder (circ, xradius, yradius);
 
@@ -1090,7 +1090,7 @@ void KisSelectionManager::shrink (TQ_INT32 xradius, TQ_INT32 yradius, bool edge_
     dev->emitSelectionChanged();
 }
 
-//Simple convolution filter to smooth a tqmask (1bpp)
+//Simple convolution filter to smooth a mask (1bpp)
 
 void KisSelectionManager::smooth()
 {
@@ -1159,7 +1159,7 @@ void KisSelectionManager::smooth()
     dev->emitSelectionChanged();
 }
 
-// Erode (radius 1 pixel) a tqmask (1bpp)
+// Erode (radius 1 pixel) a mask (1bpp)
 
 void KisSelectionManager::erode()
 {
@@ -1234,7 +1234,7 @@ void KisSelectionManager::erode()
     dev->emitSelectionChanged();
 }
 
-// dilate (radius 1 pixel) a tqmask (1bpp)
+// dilate (radius 1 pixel) a mask (1bpp)
 
 void KisSelectionManager::dilate()
 {
diff --git a/chalk/ui/kis_selection_manager.h b/chalk/ui/kis_selection_manager.h
index fb33218e2..d71353b27 100644
--- a/chalk/ui/kis_selection_manager.h
+++ b/chalk/ui/kis_selection_manager.h
@@ -40,7 +40,7 @@ class KRITACORE_EXPORT KisSelectionManager : public TQObject {
 
 public:
 
-    KisSelectionManager(KisView * tqparent, KisDoc * doc);
+    KisSelectionManager(KisView * parent, KisDoc * doc);
     virtual ~KisSelectionManager();
 
     void setup(KActionCollection * collection);
diff --git a/chalk/ui/kis_selection_options.cc b/chalk/ui/kis_selection_options.cc
index f94ff17fe..32933b5ac 100644
--- a/chalk/ui/kis_selection_options.cc
+++ b/chalk/ui/kis_selection_options.cc
@@ -32,8 +32,8 @@
 #include "kis_selection.h"
 #include "kis_paint_device.h"
 
-KisSelectionOptions::KisSelectionOptions(TQWidget *tqparent, KisCanvasSubject * subject)
-    : super(tqparent),
+KisSelectionOptions::KisSelectionOptions(TQWidget *parent, KisCanvasSubject * subject)
+    : super(parent),
       m_subject(subject)
 {
     m_page = new WdgSelectionOptions(this);
diff --git a/chalk/ui/kis_selection_options.h b/chalk/ui/kis_selection_options.h
index e8168d04b..115678cd6 100644
--- a/chalk/ui/kis_selection_options.h
+++ b/chalk/ui/kis_selection_options.h
@@ -37,7 +37,7 @@ class KRITAUI_EXPORT KisSelectionOptions : public TQWidget
     typedef TQWidget super;
 
 public:
-    KisSelectionOptions( TQWidget *tqparent, KisCanvasSubject * subject);
+    KisSelectionOptions( TQWidget *parent, KisCanvasSubject * subject);
     virtual ~KisSelectionOptions();
 
     int action();
diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc
index ef376373a..ad681c75d 100644
--- a/chalk/ui/kis_text_brush.cc
+++ b/chalk/ui/kis_text_brush.cc
@@ -43,8 +43,8 @@ void KisTextBrushResource::updateBrush()
 	setImage(px.convertToImage ());
 }
 
-KisTextBrush::KisTextBrush(TQWidget *tqparent, const char* name, const TQString& caption) 
-	: KisWdgTextBrush(tqparent, name), 
+KisTextBrush::KisTextBrush(TQWidget *parent, const char* name, const TQString& caption) 
+	: KisWdgTextBrush(parent, name), 
 	  m_textBrushResource(new KisTextBrushResource())
 {
 	setCaption(caption);
@@ -57,7 +57,7 @@ KisTextBrush::KisTextBrush(TQWidget *tqparent, const char* name, const TQString&
 
 void KisTextBrush::getFont()
 {
-	KFontDialog::getFont( m_font, false/*, TQWidget* tqparent! */ );
+	KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ );
 	rebuildTextBrush();
 }
 
diff --git a/chalk/ui/kis_text_brush.h b/chalk/ui/kis_text_brush.h
index 3c8835dee..623ff4320 100644
--- a/chalk/ui/kis_text_brush.h
+++ b/chalk/ui/kis_text_brush.h
@@ -51,7 +51,7 @@ class KisTextBrush : public KisWdgTextBrush
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KisTextBrush(TQWidget *tqparent, const char* name, const TQString& caption);
+	KisTextBrush(TQWidget *parent, const char* name, const TQString& caption);
 
 signals:
 	void activatedResource(KisResource *r);
diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc
index 5aee554bb..d6e600af5 100644
--- a/chalk/ui/kis_tool.cc
+++ b/chalk/ui/kis_tool.cc
@@ -53,10 +53,10 @@ KisTool::~KisTool()
     delete d;
 }
 
-TQWidget* KisTool::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisTool::createOptionWidget(TQWidget* parent)
 {
     
-    d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), tqparent);
+    d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent);
     d->optionWidget->setCaption(d->uiname);
     d->optionWidget->tqsetAlignment(TQt::AlignCenter);
     return d->optionWidget;
diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h
index c8f2d349a..b9abdc75d 100644
--- a/chalk/ui/kis_tool.h
+++ b/chalk/ui/kis_tool.h
@@ -93,9 +93,9 @@ public:
     virtual void setCursor(const TQCursor& cursor) = 0;
     /**
      * This function is called to create the configuration widget of the tool.
-     * @param tqparent the tqparent of the widget
+     * @param parent the parent of the widget
      */
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     /**
      * @return the current configuration widget.
      */
diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc
index d8ac04e58..51eb1407b 100644
--- a/chalk/ui/kis_tool_dummy.cc
+++ b/chalk/ui/kis_tool_dummy.cc
@@ -94,9 +94,9 @@ void KisToolDummy::setup(KActionCollection *collection)
 }
 
 
-TQWidget* KisToolDummy::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolDummy::createOptionWidget(TQWidget* parent)
 {
-    m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), tqparent);
+    m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), parent);
     m_optionWidget->setCaption(i18n("No Active Tool"));
     m_optionWidget->tqsetAlignment(TQt::AlignCenter);
     return m_optionWidget;
diff --git a/chalk/ui/kis_tool_dummy.h b/chalk/ui/kis_tool_dummy.h
index d10850e8e..de74ce84b 100644
--- a/chalk/ui/kis_tool_dummy.h
+++ b/chalk/ui/kis_tool_dummy.h
@@ -53,7 +53,7 @@ public:
     virtual void move(KisMoveEvent *e);
     virtual void buttonRelease(KisButtonReleaseEvent *e);
 
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
     
 private:
diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc
index bbe575d1c..adbf9b8ab 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.cc
@@ -182,12 +182,12 @@ void KisToolFreehand::initPaint(KisEvent *)
                 // projection).
                 KisLayer* l = layer->layer();
                 KisPaintLayer* pl = dynamic_cast<KisPaintLayer*>(l);
-                if (l->tqparent() && (l->tqparent()->tqparent() == 0)
-                    && (l->tqparent()->childCount() == 1)
-                    && l->tqparent()->paintLayerInducesProjectionOptimization(pl)) {
-                    // If there's a tqmask, device could've been the tqmask. The induce function
+                if (l->parent() && (l->parent()->parent() == 0)
+                    && (l->parent()->childCount() == 1)
+                    && l->parent()->paintLayerInducesProjectionOptimization(pl)) {
+                    // If there's a mask, device could've been the mask. The induce function
                     // should catch this, but better safe than sorry
-                    l->tqparent()->resetProjection(pl->paintDevice());
+                    l->parent()->resetProjection(pl->paintDevice());
                 }
 
                 m_target = new KisPaintDevice(m_currentImage->activeLayer(),
diff --git a/chalk/ui/kis_tool_manager.cc b/chalk/ui/kis_tool_manager.cc
index 456c60a77..458b54e23 100644
--- a/chalk/ui/kis_tool_manager.cc
+++ b/chalk/ui/kis_tool_manager.cc
@@ -32,8 +32,8 @@
 #include "kis_input_device.h"
 
 
-KisToolManager::KisToolManager(KisCanvasSubject * tqparent, KisCanvasController * controller)
-    : m_subject(tqparent),
+KisToolManager::KisToolManager(KisCanvasSubject * parent, KisCanvasController * controller)
+    : m_subject(parent),
       m_controller(controller)
 {
     m_toolBox = 0;
@@ -126,7 +126,7 @@ void KisToolManager::updateGUI()
 {
     Q_ASSERT(m_subject);
     if (m_subject == 0) {
-        // "Eek, no tqparent!
+        // "Eek, no parent!
         return;
     }
 
diff --git a/chalk/ui/kis_tool_manager.h b/chalk/ui/kis_tool_manager.h
index 8f04f6809..f33683832 100644
--- a/chalk/ui/kis_tool_manager.h
+++ b/chalk/ui/kis_tool_manager.h
@@ -47,7 +47,7 @@ class KisToolManager : public TQObject, public KisToolControllerInterface {
 
 public:
 
-    KisToolManager(KisCanvasSubject * tqparent, KisCanvasController * controller);
+    KisToolManager(KisCanvasSubject * parent, KisCanvasController * controller);
     ~KisToolManager();
 
 public:
diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc
index aa1bf7a77..9d37dae64 100644
--- a/chalk/ui/kis_tool_paint.cc
+++ b/chalk/ui/kis_tool_paint.cc
@@ -115,9 +115,9 @@ void KisToolPaint::keyRelease(TQKeyEvent *)
 {
 }
 
-TQWidget* KisToolPaint::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolPaint::createOptionWidget(TQWidget* parent)
 {
-    m_optionWidget = new TQWidget(tqparent);
+    m_optionWidget = new TQWidget(parent);
     m_optionWidget->setCaption(m_UIName);
 
     m_lbOpacity = new TQLabel(i18n("Opacity:"), m_optionWidget);
diff --git a/chalk/ui/kis_tool_paint.h b/chalk/ui/kis_tool_paint.h
index 6e1406b51..7fb4b8193 100644
--- a/chalk/ui/kis_tool_paint.h
+++ b/chalk/ui/kis_tool_paint.h
@@ -73,7 +73,7 @@ public:
 
     virtual TQCursor cursor();
     virtual void setCursor(const TQCursor& cursor);
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
     virtual void addOptionWidgetOption(TQWidget *control, TQWidget *label = 0);
 
diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc
index b919a578c..9e76f1596 100644
--- a/chalk/ui/kis_tool_shape.cc
+++ b/chalk/ui/kis_tool_shape.cc
@@ -37,9 +37,9 @@ KisToolShape::~KisToolShape()
 {
 }
 
-TQWidget* KisToolShape::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolShape::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
 
     m_tqshapeOptionsWidget = new WdgGeometryOptions(0);
     Q_CHECK_PTR(m_tqshapeOptionsWidget);
diff --git a/chalk/ui/kis_tool_shape.h b/chalk/ui/kis_tool_shape.h
index 2c0a95008..e8974c791 100644
--- a/chalk/ui/kis_tool_shape.h
+++ b/chalk/ui/kis_tool_shape.h
@@ -40,7 +40,7 @@ public:
     virtual enumToolType toolType() { return TOOL_SHAPE; }
 
 protected:
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 
     KisPainter::FillStyle fillStyle();
 
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 0b288da5e..4455f17db 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -168,8 +168,8 @@
 // sent to a receiver if it does not accept the tablet event.
 #define MOUSE_CHANGE_EVENT_DELAY 100
 
-KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent, const char *name)
-    : super(doc, tqparent, name)
+KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const char *name)
+    : super(doc, parent, name)
     , KXMLGUIBuilder( shell() )
     , m_panning( false )
     , m_oldTool( 0 )
@@ -239,7 +239,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent, const
 
     Q_ASSERT(doc);
     Q_ASSERT(adapter);
-    Q_ASSERT(tqparent);
+    Q_ASSERT(parent);
 
     KisConfig cfg;
 
@@ -380,7 +380,7 @@ static TQt::Dock stringToDock( const TQString& attrPosition )
     return dock;
 }
 
-TQWidget * KisView::createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id )
+TQWidget * KisView::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id )
 {
     if( element.attribute( "name" ) == "ToolBox" )
     {
@@ -394,11 +394,11 @@ TQWidget * KisView::createContainer( TQWidget *tqparent, int index, const TQDomE
         mainWindow()->moveDockWindow( m_toolBox, dock, false, 0, 0 );
     }
 
-    return KXMLGUIBuilder::createContainer( tqparent, index, element, id );
+    return KXMLGUIBuilder::createContainer( parent, index, element, id );
 
 }
 
-void KisView::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id )
+void KisView::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id )
 {
     Q_ASSERT(container);
 
@@ -408,7 +408,7 @@ void KisView::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomEle
         m_toolManager->youAintGotNoToolBox();
     }
     else {
-        KXMLGUIBuilder::removeContainer( container, tqparent, element, id );
+        KXMLGUIBuilder::removeContainer( container, parent, element, id );
     }
 }
 
@@ -645,20 +645,20 @@ void KisView::setupActions()
     (void)new KAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY");
 
     m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotCreateMask()), actionCollection(), "create_tqmask");
+                               TQT_SLOT(slotCreateMask()), actionCollection(), "create_mask");
     m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotMaskFromSelection()), actionCollection(),
                                       "mask_fromsel");
     m_maskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this),
                                TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel");
     m_applyMask = new KAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()),
-                              actionCollection(), "apply_tqmask");
+                              actionCollection(), "apply_mask");
     m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_tqmask");
+                               TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_mask");
     m_showMask = new KToggleAction(i18n( "Show Mask" ), 0, TQT_TQOBJECT(this),
-                                   TQT_SLOT(slotShowMask()), actionCollection(), "show_tqmask");
+                                   TQT_SLOT(slotShowMask()), actionCollection(), "show_mask");
     m_editMask = new KToggleAction(i18n( "Edit Mask" ), 0, TQT_TQOBJECT(this),
-                                   TQT_SLOT(slotEditMask()), actionCollection(), "edit_tqmask");
+                                   TQT_SLOT(slotEditMask()), actionCollection(), "edit_mask");
 
     // image actions
     m_imgFlatten = new KAction(i18n("&Flatten Image"), "Ctrl+Shift+E", TQT_TQOBJECT(this), TQT_SLOT(flattenImage()), actionCollection(), "flatten_image");
@@ -2717,13 +2717,13 @@ void KisView::layerAdd()
 {
     KisImageSP img = currentImg();
     if (img && img->activeLayer()) {
-        addLayer(img->activeLayer()->tqparent(), img->activeLayer());
+        addLayer(img->activeLayer()->parent(), img->activeLayer());
     }
     else if (img)
         addLayer(static_cast<KisGroupLayer*>(img->rootLayer().data()), 0);
 }
 
-void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above)
+void KisView::addLayer(KisGroupLayerSP parent, KisLayerSP above)
 {
     KisImageSP img = currentImg();
     if (img) {
@@ -2739,7 +2739,7 @@ void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above)
             KisLayerSP layer = new KisPaintLayer(img, dlg.layerName(), dlg.opacity(), cs);
             if (layer) {
                 layer->setCompositeOp(dlg.compositeOp());
-                img->addLayer(layer, tqparent.data(), above);
+                img->addLayer(layer, parent.data(), above);
                 updateCanvas();
             } else {
                 KMessageBox::error(this, i18n("Could not add layer to image."), i18n("Layer Error"));
@@ -2751,7 +2751,7 @@ void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above)
     }
 }
 
-void KisView::addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above)
+void KisView::addGroupLayer(KisGroupLayerSP parent, KisLayerSP above)
 {
     KisImageSP img = currentImg();
     if (img) {
@@ -2766,7 +2766,7 @@ void KisView::addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above)
             KisLayerSP layer = new KisGroupLayer(img, dlg.layerName(), dlg.opacity());
             if (layer) {
                 layer->setCompositeOp(dlg.compositeOp());
-                img->addLayer(layer, tqparent.data(), above);
+                img->addLayer(layer, parent.data(), above);
                 updateCanvas();
             } else {
                 KMessageBox::error(this, i18n("Could not add layer to image."), i18n("Layer Error"));
@@ -2783,10 +2783,10 @@ void KisView::addPartLayer()
     addPartLayer(img->rootLayer(), img->rootLayer()->firstChild(), m_actionPartLayer->documentEntry());
 }
 
-void KisView::addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry)
+void KisView::addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry)
 {
     delete m_partHandler; // Only one at a time
-    m_partHandler = new KisPartLayerHandler(this, entry, tqparent, above);
+    m_partHandler = new KisPartLayerHandler(this, entry, parent, above);
 
     disconnect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, 0);
     disconnect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, 0);
@@ -2811,7 +2811,7 @@ void KisView::addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoD
 }
 
 void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry,
-                         KisGroupLayerSP tqparent, KisLayerSP above) {
+                         KisGroupLayerSP parent, KisLayerSP above) {
     KisImageSP img = currentImg();
     if (!img) return;
 
@@ -2828,7 +2828,7 @@ void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry,
 
     KisPartLayerImpl* partLayer = new KisPartLayerImpl(img, childDoc);
     partLayer->setDocType(entry.service()->genericName());
-    img->addLayer(partLayer, tqparent, above);
+    img->addLayer(partLayer, parent, above);
     m_doc->setModified(true);
 
     reconnectAfterPartInsert();
@@ -2853,12 +2853,12 @@ void KisView::addAdjustmentLayer()
     KisImageSP img = currentImg();
     if (!img) return;
 
-    addAdjustmentLayer( img->activeLayer()->tqparent(), img->activeLayer() );
+    addAdjustmentLayer( img->activeLayer()->parent(), img->activeLayer() );
 }
 
-void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above)
+void KisView::addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above)
 {
-    Q_ASSERT(tqparent);
+    Q_ASSERT(parent);
     Q_ASSERT(above);
 
     KisImageSP img = currentImg();
@@ -2898,15 +2898,15 @@ void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above)
         KisFilterConfiguration * filter = dlg.filterConfiguration();
         TQString name = dlg.layerName();
 
-        addAdjustmentLayer( tqparent, above, name, filter, selection);
+        addAdjustmentLayer( parent, above, name, filter, selection);
 
     }
 }
 
-void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, const TQString & name,
+void KisView::addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above, const TQString & name,
                                  KisFilterConfiguration * filter, KisSelectionSP selection)
 {
-    Q_ASSERT(tqparent);
+    Q_ASSERT(parent);
     Q_ASSERT(above);
     Q_ASSERT(filter);
 
@@ -2914,7 +2914,7 @@ void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, con
     if (!img) return;
 
     KisAdjustmentLayer * l = new KisAdjustmentLayer(img, name, filter, selection);
-    img->addLayer(l, tqparent, above);
+    img->addLayer(l, parent, above);
 }
 
 void KisView::slotChildActivated(bool a) {
@@ -2943,8 +2943,8 @@ void KisView::layerRemove()
 
             img->removeLayer(layer);
 
-            if (layer->tqparent())
-                layer->tqparent()->setDirty(layer->extent());
+            if (layer->parent())
+                layer->parent()->setDirty(layer->extent());
 
             updateCanvas();
             layerUpdateGUI(img->activeLayer() != 0);
@@ -2966,7 +2966,7 @@ void KisView::layerDuplicate()
 
     KisLayerSP dup = active->clone();
     dup->setName(i18n("Duplicate of '%1'").tqarg(active->name()));
-    img->addLayer(dup, active->tqparent().data(), active);
+    img->addLayer(dup, active->parent().data(), active);
     if (dup) {
         img->activate( dup );
         updateCanvas();
diff --git a/chalk/ui/kis_view.h b/chalk/ui/kis_view.h
index 71bb9065d..3e4b69876 100644
--- a/chalk/ui/kis_view.h
+++ b/chalk/ui/kis_view.h
@@ -127,13 +127,13 @@ class KRITA_EXPORT KisView
     typedef vKisCanvasObserver::const_iterator vKisCanvasObserver_cit;
 
 public:
-    KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent = 0, const char *name = 0);
+    KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent = 0, const char *name = 0);
     virtual ~KisView();
 
 public: // KXMLGUIBuilder implementation
 
-    virtual TQWidget *createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id );
-    virtual void removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id );
+    virtual TQWidget *createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id );
+    virtual void removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id );
 
 public: // KoView implementation
     virtual bool eventFilter(TQObject *o, TQEvent *e);
@@ -220,7 +220,7 @@ public:
     void shearCurrentImage(double angleX, double angleY);
 
     void insertPart(const TQRect& viewRect, const KoDocumentEntry& entry,
-                    KisGroupLayerSP tqparent, KisLayerSP above);
+                    KisGroupLayerSP parent, KisLayerSP above);
 
     /**
      * Import an image as a layer. If there is more than
@@ -428,7 +428,7 @@ private:
 
 private slots:
     void layersUpdated(); // Used in the channel separation to notify the view that we have added a few layers.
-    void maskUpdated(); // To update the enabled or disabled status of the tqmask entries
+    void maskUpdated(); // To update the enabled or disabled status of the mask entries
 
     void slotSetFGQColor(const TQColor & c);
     void slotSetBGQColor(const TQColor & c);
@@ -466,13 +466,13 @@ private slots:
     void layerProperties();
     void showLayerProperties(KisLayerSP layer);
     void layerAdd();
-    void addLayer(KisGroupLayerSP tqparent, KisLayerSP above);
-    void addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above);
+    void addLayer(KisGroupLayerSP parent, KisLayerSP above);
+    void addGroupLayer(KisGroupLayerSP parent, KisLayerSP above);
     void addPartLayer();
-    void addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry);
+    void addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry);
     void addAdjustmentLayer();
-    void addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above);
-    void addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, const TQString & name, KisFilterConfiguration * filter, KisSelectionSP selection = 0);
+    void addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above);
+    void addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above, const TQString & name, KisFilterConfiguration * filter, KisSelectionSP selection = 0);
     void layerRemove();
     void layerDuplicate();
     void layerRaise();
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 34dd043f4..542e257df 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -52,10 +52,10 @@ KoThumbnailAdapter::~KoThumbnailAdapter() {}
 KoBirdEyePanel::KoBirdEyePanel( KoZoomAdapter * zoomListener, 
                                 KoThumbnailAdapter * thumbnailProvider,
                                 KoCanvasAdapter * canvas,
-                                TQWidget * tqparent,
+                                TQWidget * parent,
                                 const char * name,
                                 WFlags f)
-    : TQWidget(tqparent, name, f)
+    : TQWidget(parent, name, f)
     , m_zoomListener(zoomListener)
     , m_thumbnailProvider(thumbnailProvider)
     , m_canvas(canvas)
diff --git a/chalk/ui/kobirdeyepanel.h b/chalk/ui/kobirdeyepanel.h
index 24770b18d..de280d9a0 100644
--- a/chalk/ui/kobirdeyepanel.h
+++ b/chalk/ui/kobirdeyepanel.h
@@ -149,14 +149,14 @@ public:
      * @param thumbnailProvider the class that creates the small image at the right
      *        zoomlevel
      * @param canvas the place the document is painted.
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param name the TQObject name of this bird eye widget
      * @param f the widget flags (@see TQWidget)
      */
     KoBirdEyePanel( KoZoomAdapter * zoomListener, 
                     KoThumbnailAdapter * thumbnailProvider,
                     KoCanvasAdapter * canvas,
-                    TQWidget * tqparent,
+                    TQWidget * parent,
                     const char * name = 0,
                     WFlags f = 0 );
 
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 6f7cb4e2a..96e1e032a 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -83,7 +83,7 @@ public:
     KPopupMenu contextMenu;
     LayerToolTip *tooltip;
 
-    Private( TQWidget *tqparent, LayerList *list );
+    Private( TQWidget *parent, LayerList *list );
     ~Private();
 };
 
@@ -113,8 +113,8 @@ class LayerToolTip: public TQToolTip, public TQFrame
     TQImage m_img;
 
 public:
-    LayerToolTip( TQWidget *tqparent, LayerList *list )
-        : TQToolTip( tqparent ),
+    LayerToolTip( TQWidget *parent, LayerList *list )
+        : TQToolTip( parent ),
           TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM | WNoAutoErase ),
           m_list( list )
     {
@@ -257,9 +257,9 @@ public:
     }
 };
 
-LayerList::Private::Private( TQWidget *tqparent, LayerList *list )
+LayerList::Private::Private( TQWidget *parent, LayerList *list )
     : activeLayer( 0 ), foldersCanBeActive( false ), previewsShown( false ), itemHeight( 32 ),
-      tooltip( new LayerToolTip( tqparent, list ) ) { }
+      tooltip( new LayerToolTip( parent, list ) ) { }
 
 LayerList::Private::~Private()
 {
@@ -280,8 +280,8 @@ static TQSize iconSize() { return TQIconSet::iconSize( TQIconSet::Small ); }
 // LayerList //
 ///////////////
 
-LayerList::LayerList( TQWidget *tqparent, const char *name )
-    : super( tqparent, name ), d( new Private( viewport(), this ) )
+LayerList::LayerList( TQWidget *parent, const char *name )
+    : super( parent, name ), d( new Private( viewport(), this ) )
 {
     setSelectionMode( TQListView::Extended );
     setRootIsDecorated( true );
@@ -609,10 +609,10 @@ LayerItem *LayerList::addLayer( const TQString &displayName, int afterID, int id
 }
 
 //SLOT
-LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after, int id )
+LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem *parent, LayerItem *after, int id )
 {
-    if( tqparent && tqparent->isFolder() )
-        return tqparent->addLayer( displayName, after, id );
+    if( parent && parent->isFolder() )
+        return parent->addLayer( displayName, after, id );
     else
         return 0;
 }
@@ -622,23 +622,23 @@ LayerItem *LayerList::addLayerToParent( const TQString &displayName, int parentI
     return addLayerToParent( displayName, folder( parentID ), layer( afterID ), id );
 }
 
-void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ) //SLOT
+void LayerList::moveLayer( LayerItem *layer, LayerItem *parent, LayerItem *after ) //SLOT
 {
     if( !layer )
         return;
 
-    if( tqparent && !tqparent->isFolder() )
-        tqparent = 0;
+    if( parent && !parent->isFolder() )
+        parent = 0;
 
-    if( layer->tqparent() == tqparent && layer->prevSibling() == after )
+    if( layer->parent() == parent && layer->prevSibling() == after )
         return;
 
     TQListViewItem *current = currentItem();
 
-    moveItem( layer, tqparent, after );
+    moveItem( layer, parent, after );
 
-    emit layerMoved( layer, tqparent, after );
-    emit layerMoved( layer->id(), tqparent ? tqparent->id() : -1, after ? after->id() : -1 );
+    emit layerMoved( layer, parent, after );
+    emit layerMoved( layer->id(), parent ? parent->id() : -1, after ? after->id() : -1 );
 
     setCurrentItem( current ); //HACK, sometimes TQt changes this under us
 }
@@ -694,16 +694,16 @@ void LayerList::contentsMouseDoubleClickEvent( TQMouseEvent *e )
     }
 }
 
-void LayerList::findDrop( const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after )
+void LayerList::findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after )
 {
     LayerItem *item = static_cast<LayerItem*>( itemAt( contentsToViewport( pos ) ) );
     if( item && item->isFolder() )
     {
-        tqparent = item;
+        parent = item;
         after = 0;
     }
     else
-        super::findDrop( pos, tqparent, after );
+        super::findDrop( pos, parent, after );
 }
 
 void LayerList::showContextMenu()
@@ -748,22 +748,22 @@ void LayerList::menuActivated( int id, LayerItem *layer )
 {
     const TQValueList<LayerItem*> selected = selectedLayers();
 
-    LayerItem *tqparent = ( layer && layer->isFolder() ) ? layer : 0;
+    LayerItem *parent = ( layer && layer->isFolder() ) ? layer : 0;
     LayerItem *after = 0;
-    if( layer && !tqparent )
+    if( layer && !parent )
     {
-        tqparent = layer->tqparent();
+        parent = layer->parent();
         after = layer->prevSibling();
     }
     switch( id )
     {
         case MenuItems::NewLayer:
-            emit requestNewLayer( tqparent, after );
-            emit requestNewLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1 );
+            emit requestNewLayer( parent, after );
+            emit requestNewLayer( parent ? parent->id() : -1, after ? after->id() : -1 );
             break;
         case MenuItems::NewFolder:
-            emit requestNewFolder( tqparent, after );
-            emit requestNewFolder( tqparent ? tqparent->id() : -1, after ? after->id() : -1 );
+            emit requestNewFolder( parent, after );
+            emit requestNewFolder( parent ? parent->id() : -1, after ? after->id() : -1 );
             break;
         case MenuItems::RemoveLayer:
             {
@@ -810,11 +810,11 @@ void LayerList::slotItemMoved( TQPtrList<TQListViewItem> &items, TQPtrList<TQLis
         if( !l )
             continue;
 
-        if( l->tqparent() )
-            l->tqparent()->setOpen( true );
+        if( l->parent() )
+            l->parent()->setOpen( true );
 
-        emit layerMoved( l, l->tqparent(), a );
-        emit layerMoved( l->id(), l->tqparent() ? l->tqparent()->id() : -1, a ? a->id() : -1 );
+        emit layerMoved( l, l->parent(), a );
+        emit layerMoved( l->id(), l->parent() ? l->parent()->id() : -1, a ? a->id() : -1 );
     }
 }
 
@@ -861,8 +861,8 @@ void LayerItem::init()
     for( int i = 0, n = listView()->d->properties.count(); i < n; ++i )
         d->properties.append( listView()->d->properties[i].defaultValue );
 
-    if( tqparent())
-        tqparent()->setOpen( true );
+    if( parent())
+        parent()->setOpen( true );
 }
 
 LayerItem::~LayerItem()
@@ -996,7 +996,7 @@ LayerItem *LayerItem::addLayer( const TQString &displayName, LayerItem *after, i
 
 LayerItem *LayerItem::prevSibling() const
 {
-    LayerItem *item = tqparent() ? tqparent()->firstChild() : listView()->firstChild();
+    LayerItem *item = parent() ? parent()->firstChild() : listView()->firstChild();
     if( !item || this == item )
         return 0;
     for(; item && this != item->nextSibling(); item = item->nextSibling() );
@@ -1319,7 +1319,7 @@ LayerList *LayerItem::listView() const { return static_cast<LayerList*>( super::
 void LayerItem::update() const { listView()->repaintItem( this ); }
 LayerItem *LayerItem::firstChild() const { return static_cast<LayerItem*>( super::firstChild() ); }
 LayerItem *LayerItem::nextSibling() const { return static_cast<LayerItem*>( super::nextSibling() ); }
-LayerItem *LayerItem::tqparent() const { return static_cast<LayerItem*>( super::tqparent() ); }
+LayerItem *LayerItem::parent() const { return static_cast<LayerItem*>( super::parent() ); }
 
 
 #include "layerlist.moc"
diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h
index 5c75b6b75..ea6926b71 100644
--- a/chalk/ui/layerlist.h
+++ b/chalk/ui/layerlist.h
@@ -37,7 +37,7 @@ class LayerList: public KListView
   TQ_OBJECT
 
 public:
-    LayerList( TQWidget *tqparent = 0, const char *name = 0 );
+    LayerList( TQWidget *parent = 0, const char *name = 0 );
     virtual ~LayerList();
 
     void addProperty( const TQString &name, const TQString &displayName, const TQIconSet &icon = TQIconSet(),
@@ -97,10 +97,10 @@ public slots:
     LayerItem *addLayer( const TQString &displayName, LayerItem *after = 0, int id = -1 );
     LayerItem *addLayer( const TQString &displayName, int afterID, int id = -1 );
 
-    LayerItem *addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 );
+    LayerItem *addLayerToParent( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 );
     LayerItem *addLayerToParent( const TQString &displayName, int parentID, int afterID = -1, int id = -1 );
 
-    void moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after );
+    void moveLayer( LayerItem *layer, LayerItem *parent, LayerItem *after );
     void moveLayer( int id, int parentID, int afterID );
 
     void removeLayer( LayerItem *layer );
@@ -116,13 +116,13 @@ signals:
     void propertyChanged( LayerItem *layer, const TQString &name, bool on );
     void propertyChanged( int id, const TQString &name, bool on );
 
-    void layerMoved( LayerItem *layer, LayerItem *tqparent, LayerItem *after );
+    void layerMoved( LayerItem *layer, LayerItem *parent, LayerItem *after );
     void layerMoved( int id, int parentID, int afterID );
 
-    void requestNewLayer( LayerItem *tqparent, LayerItem *after );
+    void requestNewLayer( LayerItem *parent, LayerItem *after );
     void requestNewLayer( int parentID, int afterID );
 
-    void requestNewFolder( LayerItem *tqparent, LayerItem *after );
+    void requestNewFolder( LayerItem *parent, LayerItem *after );
     void requestNewFolder( int parentID, int afterID );
 
     void requestRemoveLayer( LayerItem *layer );
@@ -163,14 +163,14 @@ public: //reimplemented for internal reasons
 protected:
     virtual void contentsMousePressEvent( TQMouseEvent *e );
     virtual void contentsMouseDoubleClickEvent ( TQMouseEvent *e );
-    virtual void findDrop( const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after );
+    virtual void findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after );
 };
 
 class LayerItem: public KListViewItem
 {
 public:
-    LayerItem( const TQString &displayName, LayerList *tqparent, LayerItem *after = 0, int id = -1 );
-    LayerItem( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 );
+    LayerItem( const TQString &displayName, LayerList *parent, LayerItem *after = 0, int id = -1 );
+    LayerItem( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 );
     virtual ~LayerItem();
 
     void makeFolder();
@@ -203,7 +203,7 @@ public: //convenience
     LayerItem *nextSibling() const;
     LayerList *listView() const;
     LayerItem *firstChild() const;
-    LayerItem *tqparent() const;
+    LayerItem *parent() const;
     void update() const; //like TQWidget::update()
 
 protected:
@@ -259,10 +259,10 @@ public: //reimplemented for internal reasons
 class LayerFolder: public LayerItem
 {
 public:
-    LayerFolder( const TQString &displayName, LayerList *tqparent, LayerItem *after = 0, int id = -1 )
-        : LayerItem( displayName, tqparent, after, id ) { makeFolder(); }
-    LayerFolder( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 )
-        : LayerItem( displayName, tqparent, after, id ) { makeFolder(); }
+    LayerFolder( const TQString &displayName, LayerList *parent, LayerItem *after = 0, int id = -1 )
+        : LayerItem( displayName, parent, after, id ) { makeFolder(); }
+    LayerFolder( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 )
+        : LayerItem( displayName, parent, after, id ) { makeFolder(); }
 };
 
 
diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp
index 1c58f1dd1..6b957a26d 100644
--- a/chalk/ui/squeezedcombobox.cpp
+++ b/chalk/ui/squeezedcombobox.cpp
@@ -35,8 +35,8 @@
 
 #include "squeezedcombobox.h"
 
-SqueezedComboBoxTip::SqueezedComboBoxTip( TQWidget * tqparent, SqueezedComboBox* name )
-    : TQToolTip( tqparent )
+SqueezedComboBoxTip::SqueezedComboBoxTip( TQWidget * parent, SqueezedComboBox* name )
+    : TQToolTip( parent )
 {
     m_originalWidget = name;
 }
@@ -57,8 +57,8 @@ void SqueezedComboBoxTip::maybeTip( const TQPoint &pos )
     }
 }
 
-SqueezedComboBox::SqueezedComboBox( TQWidget *tqparent, const char *name )
-    : TQComboBox( tqparent, name )
+SqueezedComboBox::SqueezedComboBox( TQWidget *parent, const char *name )
+    : TQComboBox( parent, name )
 {
     setMinimumWidth(100);
     m_timer = new TQTimer(this);
diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h
index 0ca7bb412..03a1cdb93 100644
--- a/chalk/ui/squeezedcombobox.h
+++ b/chalk/ui/squeezedcombobox.h
@@ -51,10 +51,10 @@ public:
      * t = new SqueezedComboBoxTip( this->listBox()->viewport(), this );
      * @endcode
      * 
-     * @param tqparent tqparent widget (viewport)
-     * @param name tqparent widget
+     * @param parent parent widget (viewport)
+     * @param name parent widget
      */
-    SqueezedComboBoxTip( TQWidget *tqparent, SqueezedComboBox *name );
+    SqueezedComboBoxTip( TQWidget *parent, SqueezedComboBox *name );
 
 protected:
     /**
@@ -87,10 +87,10 @@ class SqueezedComboBox : public TQComboBox
 public:
     /**
      * Constructor
-     * @param tqparent tqparent widget
+     * @param parent parent widget
      * @param name name to give to the widget
      */
-    SqueezedComboBox(TQWidget *tqparent = 0, const char *name = 0 );
+    SqueezedComboBox(TQWidget *parent = 0, const char *name = 0 );
 
     /**
      * destructor
diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui
index 6dca87684..dba17daca 100644
--- a/chalk/ui/wdgcustombrush.ui
+++ b/chalk/ui/wdgcustombrush.ui
@@ -98,7 +98,7 @@
                 <cstring>colorAsMask</cstring>
             </property>
             <property name="text">
-                <string>Use color as tqmask</string>
+                <string>Use color as mask</string>
             </property>
         </widget>
         <widget class="TQLayoutWidget">
diff --git a/example/example_factory.cc b/example/example_factory.cc
index ebba090dc..261d75cd8 100644
--- a/example/example_factory.cc
+++ b/example/example_factory.cc
@@ -30,8 +30,8 @@ K_EXPORT_COMPONENT_FACTORY( libexamplepart, ExampleFactory )
 KInstance* ExampleFactory::s_global = 0L;
 KAboutData* ExampleFactory::s_aboutData = 0L;
 
-ExampleFactory::ExampleFactory( TQObject* tqparent, const char* name )
-    : KoFactory( tqparent, name )
+ExampleFactory::ExampleFactory( TQObject* parent, const char* name )
+    : KoFactory( parent, name )
 {
     global();
 }
@@ -44,14 +44,14 @@ ExampleFactory::~ExampleFactory()
     s_global = 0L;
 }
 
-KParts::Part* ExampleFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* ExampleFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & )
 {
     // If classname is "KoDocument", our host is a koffice application
     // otherwise, the host wants us as a simple part, so switch to readonly and single view.
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
     // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    ExamplePart *part = new ExamplePart( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    ExamplePart *part = new ExamplePart( parentWidget, widgetName, parent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
       part->setReadWrite( false );
diff --git a/example/example_factory.h b/example/example_factory.h
index 4ecc8b3a3..762deb4ba 100644
--- a/example/example_factory.h
+++ b/example/example_factory.h
@@ -30,10 +30,10 @@ class ExampleFactory : public KoFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    ExampleFactory( TQObject* tqparent = 0, const char* name = 0 );
+    ExampleFactory( TQObject* parent = 0, const char* name = 0 );
     ~ExampleFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/example/example_part.cc b/example/example_part.cc
index f71ff4f44..4afc46b0e 100644
--- a/example/example_part.cc
+++ b/example/example_part.cc
@@ -23,8 +23,8 @@
 
 #include <tqpainter.h>
 
-ExamplePart::ExamplePart( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-    : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
+ExamplePart::ExamplePart( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode )
+    : KoDocument( parentWidget, widgetName, parent, name, singleViewMode )
 {
     setInstance( ExampleFactory::global(), false );
 }
@@ -46,9 +46,9 @@ bool ExamplePart::initDoc(InitDocFlags flags, TQWidget* parentWidget)
     return TRUE;
 }
 
-KoView* ExamplePart::createViewInstance( TQWidget* tqparent, const char* name )
+KoView* ExamplePart::createViewInstance( TQWidget* parent, const char* name )
 {
-    return new ExampleView( this, tqparent, name );
+    return new ExampleView( this, parent, name );
 }
 
 bool ExamplePart::loadXML( TQIODevice *, const TQDomDocument & )
diff --git a/example/example_part.h b/example/example_part.h
index 4f551982b..06157132c 100644
--- a/example/example_part.h
+++ b/example/example_part.h
@@ -27,7 +27,7 @@ class ExamplePart : public KoDocument
     Q_OBJECT
   TQ_OBJECT
 public:
-    ExamplePart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    ExamplePart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false );
 
     virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 );
 
@@ -41,7 +41,7 @@ public:
     virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter );
 
 protected:
-    virtual KoView* createViewInstance( TQWidget* tqparent, const char* name );
+    virtual KoView* createViewInstance( TQWidget* parent, const char* name );
 };
 
 #endif
diff --git a/example/example_view.cc b/example/example_view.cc
index b23412c6c..fe15ba4f9 100644
--- a/example/example_view.cc
+++ b/example/example_view.cc
@@ -28,8 +28,8 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-ExampleView::ExampleView( ExamplePart* part, TQWidget* tqparent, const char* name )
-    : KoView( part, tqparent, name )
+ExampleView::ExampleView( ExamplePart* part, TQWidget* parent, const char* name )
+    : KoView( part, parent, name )
 {
     setInstance( ExampleFactory::global() );
     if ( !part->isReadWrite() ) // readonly case, e.g. when embedded into konqueror
diff --git a/example/example_view.h b/example/example_view.h
index 3f4866f7c..abafea8e2 100644
--- a/example/example_view.h
+++ b/example/example_view.h
@@ -32,7 +32,7 @@ class ExampleView : public KoView
     Q_OBJECT
   TQ_OBJECT
 public:
-    ExampleView( ExamplePart* part, TQWidget* tqparent = 0, const char* name = 0 );
+    ExampleView( ExamplePart* part, TQWidget* parent = 0, const char* name = 0 );
 
 protected slots:
     void cut();
diff --git a/filters/chalk/gmagick/magickexport.h b/filters/chalk/gmagick/magickexport.h
index 6ea7e2384..46a080f4f 100644
--- a/filters/chalk/gmagick/magickexport.h
+++ b/filters/chalk/gmagick/magickexport.h
@@ -26,7 +26,7 @@ class MagickExport : public KoFilter {
   TQ_OBJECT
 
 public:
-    MagickExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    MagickExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~MagickExport();
 
 public:
diff --git a/filters/chalk/gmagick/magickimport.h b/filters/chalk/gmagick/magickimport.h
index 3373f1297..22bf3002a 100644
--- a/filters/chalk/gmagick/magickimport.h
+++ b/filters/chalk/gmagick/magickimport.h
@@ -26,7 +26,7 @@ class MagickImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    MagickImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    MagickImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~MagickImport();
 
 public:
diff --git a/filters/chalk/jpeg/kis_jpeg_export.h b/filters/chalk/jpeg/kis_jpeg_export.h
index a0f473510..ea55c12c7 100644
--- a/filters/chalk/jpeg/kis_jpeg_export.h
+++ b/filters/chalk/jpeg/kis_jpeg_export.h
@@ -26,7 +26,7 @@ class KisJPEGExport : public KoFilter {
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisJPEGExport(KoFilter *tqparent, const char *name, const TQStringList&);
+        KisJPEGExport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisJPEGExport();
     public:
         virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/chalk/jpeg/kis_jpeg_import.h b/filters/chalk/jpeg/kis_jpeg_import.h
index 4cfb62c27..a32c367f7 100644
--- a/filters/chalk/jpeg/kis_jpeg_import.h
+++ b/filters/chalk/jpeg/kis_jpeg_import.h
@@ -25,7 +25,7 @@ class KisJPEGImport : public KoFilter {
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisJPEGImport(KoFilter *tqparent, const char *name, const TQStringList&);
+        KisJPEGImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisJPEGImport();
     public:
         virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/chalk/magick/magickexport.h b/filters/chalk/magick/magickexport.h
index 6ea7e2384..46a080f4f 100644
--- a/filters/chalk/magick/magickexport.h
+++ b/filters/chalk/magick/magickexport.h
@@ -26,7 +26,7 @@ class MagickExport : public KoFilter {
   TQ_OBJECT
 
 public:
-    MagickExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    MagickExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~MagickExport();
 
 public:
diff --git a/filters/chalk/magick/magickimport.h b/filters/chalk/magick/magickimport.h
index 3373f1297..22bf3002a 100644
--- a/filters/chalk/magick/magickimport.h
+++ b/filters/chalk/magick/magickimport.h
@@ -26,7 +26,7 @@ class MagickImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    MagickImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    MagickImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~MagickImport();
 
 public:
diff --git a/filters/chalk/openexr/kis_openexr_export.h b/filters/chalk/openexr/kis_openexr_export.h
index 56568e575..7f0c71f95 100644
--- a/filters/chalk/openexr/kis_openexr_export.h
+++ b/filters/chalk/openexr/kis_openexr_export.h
@@ -27,7 +27,7 @@ class KisOpenEXRExport : public KoFilter {
   TQ_OBJECT
 
 public:
-    KisOpenEXRExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    KisOpenEXRExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~KisOpenEXRExport();
 
 public:
diff --git a/filters/chalk/openexr/kis_openexr_import.h b/filters/chalk/openexr/kis_openexr_import.h
index f8cd51447..8bddb4f5d 100644
--- a/filters/chalk/openexr/kis_openexr_import.h
+++ b/filters/chalk/openexr/kis_openexr_import.h
@@ -27,7 +27,7 @@ class KisOpenEXRImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    KisOpenEXRImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    KisOpenEXRImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~KisOpenEXRImport();
 
 public:
diff --git a/filters/chalk/pdf/kis_pdf_import.h b/filters/chalk/pdf/kis_pdf_import.h
index ab4535b9d..06e22288d 100644
--- a/filters/chalk/pdf/kis_pdf_import.h
+++ b/filters/chalk/pdf/kis_pdf_import.h
@@ -26,7 +26,7 @@ class KisPDFImport : public KoFilter{
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisPDFImport(KoFilter *tqparent, const char *name, const TQStringList&);
+        KisPDFImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisPDFImport();
     public:
         virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/chalk/pdf/kis_pdf_import_widget.cpp b/filters/chalk/pdf/kis_pdf_import_widget.cpp
index 6919876f8..c395d9e90 100644
--- a/filters/chalk/pdf/kis_pdf_import_widget.cpp
+++ b/filters/chalk/pdf/kis_pdf_import_widget.cpp
@@ -30,8 +30,8 @@
 #include <klistbox.h>
 #include <knuminput.h>
 
-KisPDFImportWidget::KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * tqparent, const char * name)
-    : PDFImportWidgetBase(tqparent, name), m_pdfDoc(pdfDoc)
+KisPDFImportWidget::KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * parent, const char * name)
+    : PDFImportWidgetBase(parent, name), m_pdfDoc(pdfDoc)
 {
     m_pages.push_back(0); // The first page is selected
     updateMaxCanvasSize();
diff --git a/filters/chalk/pdf/kis_pdf_import_widget.h b/filters/chalk/pdf/kis_pdf_import_widget.h
index 8fe806a88..dc8900dd6 100644
--- a/filters/chalk/pdf/kis_pdf_import_widget.h
+++ b/filters/chalk/pdf/kis_pdf_import_widget.h
@@ -31,7 +31,7 @@ class KisPDFImportWidget : public PDFImportWidgetBase
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * tqparent, const char * name = "");
+        KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * parent, const char * name = "");
 
         ~KisPDFImportWidget();
     public:
diff --git a/filters/chalk/png/kis_png_export.h b/filters/chalk/png/kis_png_export.h
index d962523d6..433b68e34 100644
--- a/filters/chalk/png/kis_png_export.h
+++ b/filters/chalk/png/kis_png_export.h
@@ -26,7 +26,7 @@ class KisPNGExport : public KoFilter {
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisPNGExport(KoFilter *tqparent, const char *name, const TQStringList&);
+        KisPNGExport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisPNGExport();
     public:
         virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/chalk/png/kis_png_import.h b/filters/chalk/png/kis_png_import.h
index d0b8502ac..3487d24d3 100644
--- a/filters/chalk/png/kis_png_import.h
+++ b/filters/chalk/png/kis_png_import.h
@@ -25,7 +25,7 @@ class KisPNGImport : public KoFilter {
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisPNGImport(KoFilter *tqparent, const char *name, const TQStringList&);
+        KisPNGImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisPNGImport();
     public:
         virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/chalk/raw/dcraw.c b/filters/chalk/raw/dcraw.c
index e92c1d3c8..b892a5ca7 100644
--- a/filters/chalk/raw/dcraw.c
+++ b/filters/chalk/raw/dcraw.c
@@ -1146,12 +1146,12 @@ void CLASS rollei_load_raw()
 void CLASS phase_one_load_raw()
 {
   int row, col, a, b;
-  ushort *pixel, akey, bkey, tqmask;
+  ushort *pixel, akey, bkey, mask;
 
   fseek (ifp, nikon_curve_offset, SEEK_SET);
   akey = get2();
   bkey = get2();
-  tqmask = tiff_data_compression == 1 ? 0x5555:0x1354;
+  mask = tiff_data_compression == 1 ? 0x5555:0x1354;
   fseek (ifp, data_offset + top_margin*raw_width*2, SEEK_SET);
   pixel = calloc (raw_width, sizeof *pixel);
   merror (pixel, "phase_one_load_raw()");
@@ -1160,8 +1160,8 @@ void CLASS phase_one_load_raw()
     for (col=0; col < raw_width; col+=2) {
       a = pixel[col+0] ^ akey;
       b = pixel[col+1] ^ bkey;
-      pixel[col+0] = (a & tqmask) | (b & ~tqmask);
-      pixel[col+1] = (b & tqmask) | (a & ~tqmask);
+      pixel[col+0] = (a & mask) | (b & ~mask);
+      pixel[col+1] = (b & mask) | (a & ~mask);
     }
     for (col=0; col < width; col++)
       BAYER(row,col) = pixel[col+left_margin];
@@ -5731,7 +5731,7 @@ void CLASS write_psd (FILE *ofp)
     0,3,			/* mode (1=grey, 3=rgb) */
     0,0,0,0,			/* color mode data */
     0,0,0,0,			/* image resources */
-    0,0,0,0,			/* layer/tqmask info */
+    0,0,0,0,			/* layer/mask info */
     0,0				/* no compression */
   };
   int hw[2], psize, row, col, c;
diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h
index 35adb6e19..17fd576cb 100644
--- a/filters/chalk/raw/kis_raw_import.h
+++ b/filters/chalk/raw/kis_raw_import.h
@@ -33,7 +33,7 @@ class KisRawImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    KisRawImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    KisRawImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~KisRawImport();
 
 public:
diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
index 345f7e7e7..7a6ad9caf 100644
--- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp
+++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
@@ -30,8 +30,8 @@
 
 #include "kis_wdg_options_tiff.h"
 
-KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, false, i18n("TIFF Export Options"), KDialogBase::Ok | KDialogBase::Cancel)
+KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, false, i18n("TIFF Export Options"), KDialogBase::Ok | KDialogBase::Cancel)
 {
     optionswdg = new KisWdgOptionsTIFF(this);
     activated(0);
diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.h b/filters/chalk/tiff/kis_dlg_options_tiff.h
index 5fd1e48eb..519f2ceb2 100644
--- a/filters/chalk/tiff/kis_dlg_options_tiff.h
+++ b/filters/chalk/tiff/kis_dlg_options_tiff.h
@@ -32,7 +32,7 @@ class KisDlgOptionsTIFF : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisDlgOptionsTIFF(TQWidget *tqparent=0, const char *name=0);
+        KisDlgOptionsTIFF(TQWidget *parent=0, const char *name=0);
         ~KisDlgOptionsTIFF();
     public slots:
         void activated ( int index );
diff --git a/filters/chalk/tiff/kis_tiff_export.h b/filters/chalk/tiff/kis_tiff_export.h
index 113747c73..9efeb9406 100644
--- a/filters/chalk/tiff/kis_tiff_export.h
+++ b/filters/chalk/tiff/kis_tiff_export.h
@@ -26,7 +26,7 @@ class KisTIFFExport : public KoFilter {
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisTIFFExport(KoFilter *tqparent, const char *name, const TQStringList&);
+        KisTIFFExport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisTIFFExport();
     public:
         virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/chalk/tiff/kis_tiff_import.h b/filters/chalk/tiff/kis_tiff_import.h
index 9fef77557..b9e33d061 100644
--- a/filters/chalk/tiff/kis_tiff_import.h
+++ b/filters/chalk/tiff/kis_tiff_import.h
@@ -25,7 +25,7 @@ class KisTIFFImport : public KoFilter {
     Q_OBJECT
   TQ_OBJECT
     public:
-        KisTIFFImport(KoFilter *tqparent, const char *name, const TQStringList&);
+        KisTIFFImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisTIFFImport();
     public:
         virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc
index 670bec0aa..90d61755a 100644
--- a/filters/chalk/xcf/xcf/xcf-load.cc
+++ b/filters/chalk/xcf/xcf/xcf-load.cc
@@ -43,7 +43,7 @@
 //#include "core/gimpimage-guides.h"
 //#include "core/gimplayer.h"
 //#include "core/gimplayer-floating-sel.h"
-//#include "core/gimplayertqmask.h"
+//#include "core/gimplayermask.h"
 //#include "core/gimpparasitelist.h"
 //#include "core/gimpselection.h"
 //#include "core/gimptemplate.h"
@@ -69,9 +69,9 @@ static bool xcf_load_image_props (XcfInfo * info, KisImage * gimage);
 static bool xcf_load_layer_props (XcfInfo * info,
 				  KisImage * gimage,
 				  KisLayer * layer,
-				  bool * apply_tqmask,
-				  bool * edit_tqmask,
-				  bool * show_tqmask,
+				  bool * apply_mask,
+				  bool * edit_mask,
+				  bool * show_mask,
 				  TQ_INT32 * text_layer_flags);
 static bool xcf_load_channel_props (XcfInfo * info,
 				    KisImage * gimage,
@@ -81,7 +81,7 @@ static bool xcf_load_prop (XcfInfo * info,
 static KisLayer *xcf_load_layer (XcfInfo * info, KisImage * gimage);
 //static GimpChannel   * xcf_load_channel       (XcfInfo      *info,
 //                                               KisImage    *gimage);
-//static GimpLayerMask * xcf_load_layer_tqmask    (XcfInfo      *info,
+//static GimpLayerMask * xcf_load_layer_mask    (XcfInfo      *info,
 //                                               KisImage    *gimage);
 static bool xcf_load_hierarchy (XcfInfo * info, TileManager * tiles);
 static bool xcf_load_level (XcfInfo * info, TileManager * tiles);
@@ -210,7 +210,7 @@ xcf_load_image (XcfInfo * info)
         num_successful_elements++;
 
         /* add the channel to the image if its not the selection */
-        if (channel != gimage->selection_tqmask)
+        if (channel != gimage->selection_mask)
             gimp_image_add_channel (gimage, channel, -1);
 
         /* restore the saved position so we'll be ready to
@@ -547,9 +547,9 @@ static bool
 xcf_load_layer_props (XcfInfo * info,
 		      KisImage * gimage,
 		      KisLayer * layer,
-		      bool * apply_tqmask,
-		      bool * edit_tqmask,
-		      bool * show_tqmask, TQ_INT32 * text_layer_flags)
+		      bool * apply_mask,
+		      bool * edit_mask,
+		      bool * show_mask, TQ_INT32 * text_layer_flags)
 {
     PropType prop_type;
     TQ_INT32 prop_size;
@@ -612,15 +612,15 @@ xcf_load_layer_props (XcfInfo * info,
             break;
 
 	case PROP_APPLY_MASK:
-            info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) apply_tqmask, 1);
+            info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) apply_mask, 1);
             break;
 
 	case PROP_EDIT_MASK:
-            info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) edit_tqmask, 1);
+            info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) edit_mask, 1);
             break;
 
 	case PROP_SHOW_MASK:
-            info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) show_tqmask, 1);
+            info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) show_mask, 1);
             break;
 
 	case PROP_OFFSETS:
@@ -707,20 +707,20 @@ xcf_load_channel_props (XcfInfo * info,
             break;
 
 	case PROP_SELECTION:
-            g_object_unref (gimage->selection_tqmask);
-            gimage->selection_tqmask =
+            g_object_unref (gimage->selection_mask);
+            gimage->selection_mask =
                 gimp_selection_new (gimage,
                                     gimp_item_width (GIMP_ITEM (*channel)),
                                     gimp_item_height (GIMP_ITEM (*channel)));
-            g_object_ref (gimage->selection_tqmask);
-            gimp_item_sink (GIMP_ITEM (gimage->selection_tqmask));
+            g_object_ref (gimage->selection_mask);
+            gimp_item_sink (GIMP_ITEM (gimage->selection_mask));
 
-            tile_manager_unref (GIMP_DRAWABLE (gimage->selection_tqmask)->tiles);
-            GIMP_DRAWABLE (gimage->selection_tqmask)->tiles =
+            tile_manager_unref (GIMP_DRAWABLE (gimage->selection_mask)->tiles);
+            GIMP_DRAWABLE (gimage->selection_mask)->tiles =
                 GIMP_DRAWABLE (*channel)->tiles;
             GIMP_DRAWABLE (*channel)->tiles = NULL;
             g_object_unref (*channel);
-            *channel = gimage->selection_tqmask;
+            *channel = gimage->selection_mask;
             (*channel)->boundary_known = FALSE;
             (*channel)->bounds_known = FALSE;
             break;
@@ -831,12 +831,12 @@ static KisLayer *
 xcf_load_layer (XcfInfo * info, KisImage * gimage)
 {
     KisLayer *layer;
-    GimpLayerMask *layer_tqmask;
+    GimpLayerMask *layer_mask;
     TQ_INT32 hierarchy_offset;
     TQ_INT32 layer_mask_offset;
-    bool apply_tqmask = TRUE;
-    bool edit_tqmask = FALSE;
-    bool show_tqmask = FALSE;
+    bool apply_mask = TRUE;
+    bool edit_mask = FALSE;
+    bool show_mask = FALSE;
     bool active;
     bool floating;
     TQ_INT32 text_layer_flags = 0;
@@ -866,7 +866,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage)
 
     /* read in the layer properties */
     if (!xcf_load_layer_props (info, gimage, layer,
-                               &apply_tqmask, &edit_tqmask, &show_tqmask,
+                               &apply_mask, &edit_mask, &show_mask,
                                &text_layer_flags))
         goto error;
 
@@ -885,7 +885,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage)
             info->floating_sel = layer;
     }
 
-    /* read the hierarchy and layer tqmask offsets */
+    /* read the hierarchy and layer mask offsets */
     info->cp += xcf_read_int32 (info->fp, &hierarchy_offset, 1);
     info->cp += xcf_read_int32 (info->fp, &layer_mask_offset, 1);
 
@@ -896,21 +896,21 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage)
     if (!xcf_load_hierarchy (info, GIMP_DRAWABLE (layer)->tiles))
         goto error;
 
-    /* read in the layer tqmask */
+    /* read in the layer mask */
     if (layer_mask_offset != 0)
     {
         if (!xcf_seek_pos (info, layer_mask_offset, NULL))
             goto error;
 
-        layer_tqmask = xcf_load_layer_tqmask (info, gimage);
-        if (!layer_tqmask)
+        layer_mask = xcf_load_layer_mask (info, gimage);
+        if (!layer_mask)
             goto error;
 
-        layer_tqmask->apply_tqmask = apply_tqmask;
-        layer_tqmask->edit_tqmask = edit_tqmask;
-        layer_tqmask->show_tqmask = show_tqmask;
+        layer_mask->apply_mask = apply_mask;
+        layer_mask->edit_mask = edit_mask;
+        layer_mask->show_mask = show_mask;
 
-        gimp_layer_add_tqmask (layer, layer_tqmask, FALSE);
+        gimp_layer_add_mask (layer, layer_mask, FALSE);
     }
 
     /* attach the floating selection... */
@@ -955,7 +955,7 @@ xcf_load_channel (XcfInfo * info, KisImage * gimage)
     if (!xcf_load_channel_props (info, gimage, &channel))
         goto error;
 
-    /* read the hierarchy and layer tqmask offsets */
+    /* read the hierarchy and layer mask offsets */
     info->cp += xcf_read_int32 (info->fp, &hierarchy_offset, 1);
 
     /* read in the hierarchy */
@@ -976,9 +976,9 @@ error:
 }
 
 static GimpLayerMask *
-xcf_load_layer_tqmask (XcfInfo * info, KisImage * gimage)
+xcf_load_layer_mask (XcfInfo * info, KisImage * gimage)
 {
-    GimpLayerMask *layer_tqmask;
+    GimpLayerMask *layer_mask;
     GimpChannel *channel;
     TQ_INT32 hierarchy_offset;
     TQ_INT32 width;
@@ -997,35 +997,35 @@ xcf_load_layer_tqmask (XcfInfo * info, KisImage * gimage)
     info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) & height, 1);
     info->cp += xcf_read_string (info->fp, &name, 1);
 
-    /* create a new layer tqmask */
-    layer_tqmask = gimp_layer_mask_new (gimage, width, height, name, &color);
+    /* create a new layer mask */
+    layer_mask = gimp_layer_mask_new (gimage, width, height, name, &color);
     g_free (name);
-    if (!layer_tqmask)
+    if (!layer_mask)
         return NULL;
 
-    /* read in the layer_tqmask properties */
-    channel = GIMP_CHANNEL (layer_tqmask);
+    /* read in the layer_mask properties */
+    channel = GIMP_CHANNEL (layer_mask);
     if (!xcf_load_channel_props (info, gimage, &channel))
         goto error;
 
-    /* read the hierarchy and layer tqmask offsets */
+    /* read the hierarchy and layer mask offsets */
     info->cp += xcf_read_int32 (info->fp, &hierarchy_offset, 1);
 
     /* read in the hierarchy */
     if (!xcf_seek_pos (info, hierarchy_offset, NULL))
         goto error;
 
-    if (!xcf_load_hierarchy (info, GIMP_DRAWABLE (layer_tqmask)->tiles))
+    if (!xcf_load_hierarchy (info, GIMP_DRAWABLE (layer_mask)->tiles))
         goto error;
 
     /* attach the floating selection... */
     if (is_fs_drawable)
-        info->floating_sel_drawable = GIMP_DRAWABLE (layer_tqmask);
+        info->floating_sel_drawable = GIMP_DRAWABLE (layer_mask);
 
-    return layer_tqmask;
+    return layer_mask;
 
 error:
-    g_object_unref (layer_tqmask);
+    g_object_unref (layer_mask);
     return NULL;
 }
 
diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc
index c90437381..3544baf42 100644
--- a/filters/chalk/xcf/xcf/xcf-save.cc
+++ b/filters/chalk/xcf/xcf/xcf-save.cc
@@ -40,7 +40,7 @@
 #include "core/gimpimage-guides.h"
 #include "core/gimplayer.h"
 #include "core/gimplayer-floating-sel.h"
-#include "core/gimplayertqmask.h"
+#include "core/gimplayermask.h"
 #include "core/gimplist.h"
 #include "core/gimpparasitelist.h"
 #include "core/gimpunit.h"
@@ -293,7 +293,7 @@ xcf_save_image (XcfInfo   *info,
     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_tqmask (gimage),
+    have_selection = gimp_channel_bounds (gimp_image_get_mask (gimage),
                                           &t1, &t2, &t3, &t4);
     if (have_selection)
         nchannels += 1;
@@ -365,7 +365,7 @@ xcf_save_image (XcfInfo   *info,
 	}
         else
 	{
-            channel = gimage->selection_tqmask;
+            channel = gimage->selection_mask;
             have_selection = FALSE;
 	}
 
@@ -506,14 +506,14 @@ xcf_save_layer_props (XcfInfo   *info,
     xcf_check_error (xcf_save_prop (info, gimage, PROP_LOCK_ALPHA,
                                     error, layer->lock_alpha));
 
-    if (layer->tqmask)
+    if (layer->mask)
     {
         xcf_check_error (xcf_save_prop (info, gimage, PROP_APPLY_MASK,
-                                        error, layer->tqmask->apply_tqmask));
+                                        error, layer->mask->apply_mask));
         xcf_check_error (xcf_save_prop (info, gimage, PROP_EDIT_MASK,
-                                        error, layer->tqmask->edit_tqmask));
+                                        error, layer->mask->edit_mask));
         xcf_check_error (xcf_save_prop (info, gimage, PROP_SHOW_MASK,
-                                        error, layer->tqmask->show_tqmask));
+                                        error, layer->mask->show_mask));
     }
     else
     {
@@ -575,7 +575,7 @@ xcf_save_channel_props (XcfInfo     *info,
     if (channel == gimp_image_get_active_channel (gimage))
         xcf_check_error (xcf_save_prop (info, gimage, PROP_ACTIVE_CHANNEL, error));
 
-    if (channel == gimage->selection_tqmask)
+    if (channel == gimage->selection_mask)
         xcf_check_error (xcf_save_prop (info, gimage, PROP_SELECTION, error));
 
     xcf_check_error (xcf_save_prop (info, gimage, PROP_OPACITY, error,
@@ -735,40 +735,40 @@ xcf_save_prop (XcfInfo   *info,
 
     case PROP_APPLY_MASK:
     {
-	TQ_INT32 apply_tqmask;
+	TQ_INT32 apply_mask;
 
-	apply_tqmask = va_arg (args, TQ_INT32);
+	apply_mask = va_arg (args, TQ_INT32);
 	size = 4;
 
         xcf_write_prop_type_check_error (info, prop_type);
 	xcf_write_int32_check_error (info, &size, 1);
-	xcf_write_int32_check_error (info, &apply_tqmask, 1);
+	xcf_write_int32_check_error (info, &apply_mask, 1);
     }
     break;
 
     case PROP_EDIT_MASK:
     {
-	TQ_INT32 edit_tqmask;
+	TQ_INT32 edit_mask;
 
-	edit_tqmask = va_arg (args, TQ_INT32);
+	edit_mask = va_arg (args, TQ_INT32);
 	size = 4;
 
         xcf_write_prop_type_check_error (info, prop_type);
 	xcf_write_int32_check_error (info, &size, 1);
-	xcf_write_int32_check_error (info, &edit_tqmask, 1);
+	xcf_write_int32_check_error (info, &edit_mask, 1);
     }
     break;
 
     case PROP_SHOW_MASK:
     {
-	TQ_INT32 show_tqmask;
+	TQ_INT32 show_mask;
 
-	show_tqmask = va_arg (args, TQ_INT32);
+	show_mask = va_arg (args, TQ_INT32);
 	size = 4;
 
         xcf_write_prop_type_check_error (info, prop_type);
 	xcf_write_int32_check_error (info, &size, 1);
-	xcf_write_int32_check_error (info, &show_tqmask, 1);
+	xcf_write_int32_check_error (info, &show_mask, 1);
     }
     break;
 
@@ -1120,14 +1120,14 @@ xcf_save_layer (XcfInfo   *info,
     xcf_write_int32_check_error (info, &offset, 1);
     saved_pos = info->cp;
 
-    /* write out the layer tqmask */
-    if (layer->tqmask)
+    /* write out the layer mask */
+    if (layer->mask)
     {
         xcf_check_error (xcf_seek_end (info, error));
         offset = info->cp;
 
         xcf_check_error (xcf_save_channel (info,
-                                           gimage, GIMP_CHANNEL(layer->tqmask),
+                                           gimage, GIMP_CHANNEL(layer->mask),
                                            error));
     }
     else
diff --git a/filters/chalk/xcf/xcfexport.h b/filters/chalk/xcf/xcfexport.h
index b6acf737b..b8f260fbb 100644
--- a/filters/chalk/xcf/xcfexport.h
+++ b/filters/chalk/xcf/xcfexport.h
@@ -26,7 +26,7 @@ class XCFExport : public KoFilter {
   TQ_OBJECT
 
 public:
-    XCFExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    XCFExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~XCFExport();
 
 public:
diff --git a/filters/chalk/xcf/xcfimport.h b/filters/chalk/xcf/xcfimport.h
index 038e76043..434566bac 100644
--- a/filters/chalk/xcf/xcfimport.h
+++ b/filters/chalk/xcf/xcfimport.h
@@ -26,7 +26,7 @@ class XCFImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    XCFImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    XCFImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~XCFImport();
 
 public:
diff --git a/filters/generic_wrapper/generic_filter.h b/filters/generic_wrapper/generic_filter.h
index 1fde2b953..7b47406b6 100644
--- a/filters/generic_wrapper/generic_filter.h
+++ b/filters/generic_wrapper/generic_filter.h
@@ -33,7 +33,7 @@ class GenericFilter : public KoFilter
   TQ_OBJECT
 
 public:
-    GenericFilter(KoFilter *tqparent, const char *name, const TQStringList&);
+    GenericFilter(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~GenericFilter() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from,
diff --git a/filters/karbon/ai/aiimport.h b/filters/karbon/ai/aiimport.h
index 901eba6d7..c305b5365 100644
--- a/filters/karbon/ai/aiimport.h
+++ b/filters/karbon/ai/aiimport.h
@@ -33,7 +33,7 @@ class AiImport : public KoFilter
   TQ_OBJECT
 
 public:
-	AiImport( KoFilter* tqparent, const char* name, const TQStringList& );
+	AiImport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~AiImport();
 
 	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/karbon/applixgraphics/applixgraphicimport.h b/filters/karbon/applixgraphics/applixgraphicimport.h
index 4b25471d4..3e42256ed 100644
--- a/filters/karbon/applixgraphics/applixgraphicimport.h
+++ b/filters/karbon/applixgraphics/applixgraphicimport.h
@@ -29,7 +29,7 @@ class APPLIXGRAPHICImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    APPLIXGRAPHICImport (KoFilter *tqparent, const char *name, const TQStringList&);
+    APPLIXGRAPHICImport (KoFilter *parent, const char *name, const TQStringList&);
     virtual ~APPLIXGRAPHICImport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/karbon/eps/epsexport.h b/filters/karbon/eps/epsexport.h
index 939887c96..1313294e8 100644
--- a/filters/karbon/eps/epsexport.h
+++ b/filters/karbon/eps/epsexport.h
@@ -43,7 +43,7 @@ class EpsExport : public KoFilter, private VVisitor
   TQ_OBJECT
 
 public:
-	EpsExport( KoFilter* tqparent, const char* name, const TQStringList& );
+	EpsExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~EpsExport() {}
 
 	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/karbon/eps/epsexportdlg.cc b/filters/karbon/eps/epsexportdlg.cc
index df51b95b2..220dbebaf 100644
--- a/filters/karbon/eps/epsexportdlg.cc
+++ b/filters/karbon/eps/epsexportdlg.cc
@@ -29,8 +29,8 @@
 #include "epsexportdlg.h"
 
 
-EpsExportDlg::EpsExportDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "EPS Export" ), Ok | Cancel )
+EpsExportDlg::EpsExportDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "EPS Export" ), Ok | Cancel )
 {
 	TQVBox* page = makeVBoxMainWidget();
 
diff --git a/filters/karbon/eps/epsexportdlg.h b/filters/karbon/eps/epsexportdlg.h
index 6850fc973..ac27c536d 100644
--- a/filters/karbon/eps/epsexportdlg.h
+++ b/filters/karbon/eps/epsexportdlg.h
@@ -32,7 +32,7 @@ class EpsExportDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	EpsExportDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	EpsExportDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	uint psLevel() const;
 	bool exportHidden() const;
diff --git a/filters/karbon/eps/epsimport.h b/filters/karbon/eps/epsimport.h
index f5e17dfbf..873dc169a 100644
--- a/filters/karbon/eps/epsimport.h
+++ b/filters/karbon/eps/epsimport.h
@@ -33,7 +33,7 @@ class EpsImport : public KoFilter
   TQ_OBJECT
 
 public:
-	EpsImport( KoFilter* tqparent, const char* name, const TQStringList& );
+	EpsImport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~EpsImport();
 
 	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/karbon/kontour/kontourimport.h b/filters/karbon/kontour/kontourimport.h
index 9e9bc85ad..e140f088c 100644
--- a/filters/karbon/kontour/kontourimport.h
+++ b/filters/karbon/kontour/kontourimport.h
@@ -30,7 +30,7 @@ class KontourImport : public KoFilter
   TQ_OBJECT
 
 public:
-	KontourImport(KoFilter *tqparent, const char *name, const TQStringList&);
+	KontourImport(KoFilter *parent, const char *name, const TQStringList&);
 	virtual ~KontourImport();
 
 	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc
index ab48642d0..88e4f10b6 100644
--- a/filters/karbon/msod/msod.cc
+++ b/filters/karbon/msod/msod.cc
@@ -1061,8 +1061,8 @@ void Msod::walk(TQ_UINT32 bytes, TQDataStream &operands)
 }
 
 Msod::Options::Options(
-    Msod &tqparent) :
-        m_parent(tqparent)
+    Msod &parent) :
+        m_parent(parent)
 {
     m_pVertices = 0L;
     initialise();
diff --git a/filters/karbon/msod/msod.h b/filters/karbon/msod/msod.h
index a1243aaa2..f53146bfa 100644
--- a/filters/karbon/msod/msod.h
+++ b/filters/karbon/msod/msod.h
@@ -221,7 +221,7 @@ private:
     class Options
     {
     public:
-        Options(Msod &tqparent);
+        Options(Msod &parent);
         ~Options();
         void walk(
             TQ_UINT32 bytes,
diff --git a/filters/karbon/msod/msodimport.h b/filters/karbon/msod/msodimport.h
index ec036bdf5..162176de1 100644
--- a/filters/karbon/msod/msodimport.h
+++ b/filters/karbon/msod/msodimport.h
@@ -34,7 +34,7 @@ class MSODImport :
 
 public:
     MSODImport(
-        KoFilter *tqparent,
+        KoFilter *parent,
         const char *name,
         const TQStringList&);
     virtual ~MSODImport();
@@ -66,7 +66,7 @@ protected:
         const TQPointArray &points);
 
 signals:
-    // Communication signals to the tqparent filters
+    // Communication signals to the parent filters
     void commSignalDelayStream( const char* delay );
     void commSignalShapeID( unsigned int& tqshapeID );
 
diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc
index ef90c93d8..90320d7e0 100644
--- a/filters/karbon/oodraw/oodrawimport.cc
+++ b/filters/karbon/oodraw/oodrawimport.cc
@@ -229,7 +229,7 @@ KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename
 }
 
 void
-OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
+OoDrawImport::parseGroup( VGroup *parent, const TQDomElement& parentobject )
 {
 	// parse all objects
 	for( TQDomNode object = parentobject.firstChild(); !object.isNull(); object = object.nextSibling() )
@@ -243,7 +243,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 		if( name == "g" ) // polyline
 		{
 			storeObjectStyles( o );
-			VGroup *group = new VGroup( tqparent );
+			VGroup *group = new VGroup( parent );
 			appendPen( *group );
 			appendBrush( *group );
 			obj = group;
@@ -257,7 +257,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 			double w = KoUnit::parseValue( o.attributeNS( ooNS::svg, "width", TQString() ) );
 			double h = KoUnit::parseValue( o.attributeNS( ooNS::svg, "height", TQString() ) );
 			int corner = static_cast<int>( KoUnit::parseValue( o.attributeNS( ooNS::draw, "corner-radius", TQString() ) ) );
-			VRectangle *rect = new VRectangle( tqparent, KoPoint( x, y ), w, h, corner );
+			VRectangle *rect = new VRectangle( parent, KoPoint( x, y ), w, h, corner );
 			appendPen( *rect );
 			appendBrush( *rect );
 			obj = rect;
@@ -282,7 +282,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 				else if( kind == "arc" )
 					type = VEllipse::arc;
 			}
-			VEllipse *ellipse = new VEllipse( tqparent, KoPoint( x, y ), w, h, type, start, end );
+			VEllipse *ellipse = new VEllipse( parent, KoPoint( x, y ), w, h, type, start, end );
 			appendPen( *ellipse );
 			// arc has no brush
 			if( kind != "arc" )
@@ -292,7 +292,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 		else if( name == "line" ) // line
 		{
 			storeObjectStyles( o );
-			VPath *line = new VPath( tqparent );
+			VPath *line = new VPath( parent );
 			double x1 = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x1", TQString() ) );
 			double y1 = ymirror( KoUnit::parseValue( o.attributeNS( ooNS::svg, "y1", TQString() ) ) );
 			double x2 = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x2", TQString() ) );
@@ -306,7 +306,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 		else if( name == "polyline" ) // polyline
 		{
 			storeObjectStyles( o );
-			VPath *polyline = new VPath( tqparent );
+			VPath *polyline = new VPath( parent );
 			appendPoints( *polyline, o);
 			appendPen( *polyline );
 			appendBrush( *polyline );
@@ -315,9 +315,9 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 		else if( name == "polygon" ) // polygon
 		{
 			storeObjectStyles( o );
-			//VPolygon *polygon = new VPolygon( tqparent );
+			//VPolygon *polygon = new VPolygon( parent );
 			//polygon->load( o );
-			VPath *polygon = new VPath( tqparent );
+			VPath *polygon = new VPath( parent );
 			appendPoints( *polygon, o );
 			appendPen( *polygon );
 			appendBrush( *polygon );
@@ -326,7 +326,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 		else if( name == "path" ) // path
 		{
 			storeObjectStyles( o );
-			VPath *path = new VPath( tqparent );
+			VPath *path = new VPath( parent );
 			path->loadSvgPath( o.attributeNS( ooNS::svg, "d", TQString() ) );
 			KoRect rect = parseViewBox( o );
 			double x = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x", TQString() ) );
@@ -353,8 +353,8 @@ appendImage( doc, e, pictureElement, o );
 			kdDebug() << "Unsupported object '" << name << "'" << endl;
 			continue;
 		}
-		if( tqparent && obj )
-			tqparent->append( obj );
+		if( parent && obj )
+			parent->append( obj );
 		else if( obj )
 			m_document.append( obj );
 	}
@@ -636,9 +636,9 @@ OoDrawImport::fillStyleStack( const TQDomElement& object )
 void
 OoDrawImport::addStyles( const TQDomElement* style )
 {
-    // this function is necessary as tqparent styles can have parents themself
-    if( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) )
-        addStyles( m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )] );
+    // this function is necessary as parent styles can have parents themself
+    if( style->hasAttributeNS( ooNS::style, "parent-style-name" ) )
+        addStyles( m_styles[style->attributeNS( ooNS::style, "parent-style-name", TQString() )] );
 
     m_styleStack.push( *style );
 }
diff --git a/filters/karbon/oodraw/oodrawimport.h b/filters/karbon/oodraw/oodrawimport.h
index ea29b2765..2b395f48a 100644
--- a/filters/karbon/oodraw/oodrawimport.h
+++ b/filters/karbon/oodraw/oodrawimport.h
@@ -40,7 +40,7 @@ class OoDrawImport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    OoDrawImport( KoFilter *tqparent, const char *name, const TQStringList & );
+    OoDrawImport( KoFilter *parent, const char *name, const TQStringList & );
     virtual ~OoDrawImport();
 
     virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
@@ -58,7 +58,7 @@ private:
 	void appendBrush( VObject &obj );
 	void appendPoints(VPath &path, const TQDomElement& object);
 	void convert();
-	void parseGroup( VGroup *tqparent, const TQDomElement& object );
+	void parseGroup( VGroup *parent, const TQDomElement& object );
 	void parseColor( VColor &color, const TQString &s );
 	double ymirror( double y );
 	KoRect parseViewBox( const TQDomElement& object );
diff --git a/filters/karbon/png/pngexport.h b/filters/karbon/png/pngexport.h
index 9fe9f7ebd..3758daa36 100644
--- a/filters/karbon/png/pngexport.h
+++ b/filters/karbon/png/pngexport.h
@@ -30,7 +30,7 @@ class PngExport : public KoFilter, private VVisitor
   TQ_OBJECT
 
 public:
-	PngExport( KoFilter* tqparent, const char* name, const TQStringList& );
+	PngExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~PngExport() {}
 
 	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/karbon/svg/svgexport.h b/filters/karbon/svg/svgexport.h
index 6a79fb072..6bfe5d988 100644
--- a/filters/karbon/svg/svgexport.h
+++ b/filters/karbon/svg/svgexport.h
@@ -49,7 +49,7 @@ class SvgExport : public KoFilter, private VVisitor
   TQ_OBJECT
 
 public:
-	SvgExport( KoFilter* tqparent, const char* name, const TQStringList& );
+	SvgExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~SvgExport() {}
 
 	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/karbon/svg/svgimport.h b/filters/karbon/svg/svgimport.h
index 24857b65c..e4e3f56a7 100644
--- a/filters/karbon/svg/svgimport.h
+++ b/filters/karbon/svg/svgimport.h
@@ -42,7 +42,7 @@ class SvgImport : public KoFilter
   TQ_OBJECT
 
 public:
-	SvgImport(KoFilter *tqparent, const char *name, const TQStringList&);
+	SvgImport(KoFilter *parent, const char *name, const TQStringList&);
 	virtual ~SvgImport();
 
 	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/karbon/wmf/wmfexport.h b/filters/karbon/wmf/wmfexport.h
index 9d7bf9cbe..e0c9be57c 100644
--- a/filters/karbon/wmf/wmfexport.h
+++ b/filters/karbon/wmf/wmfexport.h
@@ -38,7 +38,7 @@ class WmfExport : public KoFilter, private VVisitor
   TQ_OBJECT
 
 public:
-    WmfExport( KoFilter *tqparent, const char *name, const TQStringList&);
+    WmfExport( KoFilter *parent, const char *name, const TQStringList&);
     virtual ~WmfExport();
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/karbon/wmf/wmfimport.h b/filters/karbon/wmf/wmfimport.h
index 45ddefec9..21bcee74b 100644
--- a/filters/karbon/wmf/wmfimport.h
+++ b/filters/karbon/wmf/wmfimport.h
@@ -33,7 +33,7 @@ class WMFImport : public KoFilter
   TQ_OBJECT
 
 public:
-    WMFImport( KoFilter *tqparent, const char *name, const TQStringList&);
+    WMFImport( KoFilter *parent, const char *name, const TQStringList&);
     virtual ~WMFImport();
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/karbon/xaml/xamlexport.h b/filters/karbon/xaml/xamlexport.h
index cb762a8de..b1a0f4fdc 100644
--- a/filters/karbon/xaml/xamlexport.h
+++ b/filters/karbon/xaml/xamlexport.h
@@ -47,7 +47,7 @@ class XAMLExport : public KoFilter, private VVisitor
   TQ_OBJECT
 
 public:
-	XAMLExport( KoFilter* tqparent, const char* name, const TQStringList& );
+	XAMLExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~XAMLExport() {}
 
 	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/karbon/xaml/xamlimport.h b/filters/karbon/xaml/xamlimport.h
index 83f11fc87..b61313b98 100644
--- a/filters/karbon/xaml/xamlimport.h
+++ b/filters/karbon/xaml/xamlimport.h
@@ -40,7 +40,7 @@ class XAMLImport : public KoFilter
   TQ_OBJECT
 
 public:
-	XAMLImport(KoFilter *tqparent, const char *name, const TQStringList&);
+	XAMLImport(KoFilter *parent, const char *name, const TQStringList&);
 	virtual ~XAMLImport();
 
 	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc
index d5a0c71ba..3e9237fb4 100644
--- a/filters/karbon/xcf/xcfexport.cc
+++ b/filters/karbon/xcf/xcfexport.cc
@@ -223,21 +223,21 @@ XcfExport::visitVLayer( VLayer& layer )
 	// False.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
 
-	// Apply tqmask?
+	// Apply mask?
 	*m_stream << static_cast<TQ_UINT32>( 11 );
 	// Property size in bytes.
 	*m_stream << static_cast<TQ_UINT32>( 4 );
 	// False.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
 
-	// Edit tqmask?
+	// Edit mask?
 	*m_stream << static_cast<TQ_UINT32>( 12 );
 	// Property size in bytes.
 	*m_stream << static_cast<TQ_UINT32>( 4 );
 	// False.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
 
-	// Show tqmask?
+	// Show mask?
 	*m_stream << static_cast<TQ_UINT32>( 13 );
 	// Property size in bytes.
 	*m_stream << static_cast<TQ_UINT32>( 4 );
@@ -302,7 +302,7 @@ XcfExport::visitVLayer( VLayer& layer )
 	*m_stream << start;
 
 
-	// Append a zero offset to indicate end of layer tqmask offsets.
+	// Append a zero offset to indicate end of layer mask offsets.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
 }
 
diff --git a/filters/karbon/xcf/xcfexport.h b/filters/karbon/xcf/xcfexport.h
index 0c60dd4ea..82d868833 100644
--- a/filters/karbon/xcf/xcfexport.h
+++ b/filters/karbon/xcf/xcfexport.h
@@ -37,7 +37,7 @@ class XcfExport : public KoFilter, private VVisitor
   TQ_OBJECT
 
 public:
-	XcfExport( KoFilter* tqparent, const char* name, const TQStringList& );
+	XcfExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~XcfExport() {}
 
 	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/karbon/xfig/xfigimport.cc b/filters/karbon/xfig/xfigimport.cc
index 2932e05cc..015c40060 100644
--- a/filters/karbon/xfig/xfigimport.cc
+++ b/filters/karbon/xfig/xfigimport.cc
@@ -134,7 +134,7 @@ int hexstrToInt (const char *str) {
    return value;
 }
 
-XFIGImport::XFIGImport( KoFilter *tqparent, const char *name ) : KoFilter(tqparent, name)
+XFIGImport::XFIGImport( KoFilter *parent, const char *name ) : KoFilter(parent, name)
 {
   fig_resolution = 1200.0 / 72.0;
   coordinate_system = 2;
@@ -473,7 +473,7 @@ void XFIGImport::parsePolyline (istream& fin, GDocument* doc) {
   int arrow_type, arrow_style;
   float arrow_thickness, arrow_width, arrow_height;
   GObject::OutlineInfo oinfo;
-  oinfo.tqmask = GObject::OutlineInfo::Custom;
+  oinfo.mask = GObject::OutlineInfo::Custom;
   oinfo.startArrowId = oinfo.endArrowId = 0;
 
   if (forward_arrow > 0) {
@@ -537,7 +537,7 @@ void XFIGImport::parseSpline (istream& fin, GDocument* doc)
   int arrow_type, arrow_style;
   float arrow_thickness, arrow_width, arrow_height;
   GObject::OutlineInfo oinfo;
-  oinfo.tqmask = GObject::OutlineInfo::Custom;
+  oinfo.mask = GObject::OutlineInfo::Custom;
   oinfo.startArrowId = oinfo.endArrowId = 0;
 
   if (forward_arrow > 0) {
diff --git a/filters/karbon/xfig/xfigimport.h b/filters/karbon/xfig/xfigimport.h
index 5cf9dddf7..c084cc8d2 100644
--- a/filters/karbon/xfig/xfigimport.h
+++ b/filters/karbon/xfig/xfigimport.h
@@ -43,7 +43,7 @@ class XFIGImport : public KoFilter
   TQ_OBJECT
 
 public:
-    XFIGImport( KoFilter *tqparent, const char *name );
+    XFIGImport( KoFilter *parent, const char *name );
     virtual ~XFIGImport();
 
     virtual bool filterImport( const TQString &file, KoDocument *,
diff --git a/filters/karbon/xfig/xfigimport_factory.cc b/filters/karbon/xfig/xfigimport_factory.cc
index 79fb695ca..d734b1761 100644
--- a/filters/karbon/xfig/xfigimport_factory.cc
+++ b/filters/karbon/xfig/xfigimport_factory.cc
@@ -33,9 +33,9 @@ K_EXPORT_COMPONENT_FACTORY( libxfigimport, XFIGImportFactory )
 KInstance *XFIGImportFactory::s_global = 0;
 
 XFIGImportFactory::XFIGImportFactory(
-    TQObject *tqparent,
+    TQObject *parent,
     const char *name) :
-        KLibFactory(tqparent, name)
+        KLibFactory(parent, name)
 {
     s_global = new KInstance("xfigimport");
 }
@@ -47,17 +47,17 @@ XFIGImportFactory::~XFIGImportFactory()
 }
 
 TQObject *XFIGImportFactory::createObject(
-    TQObject *tqparent,
+    TQObject *parent,
     const char *name,
     const char*,
     const TQStringList &)
 {
-    if (tqparent && !tqparent->inherits("KoFilter"))
+    if (parent && !parent->inherits("KoFilter"))
     {
-	    kdDebug(30502) << "XFIGImportFactory: tqparent does not inherit KoFilter" << endl;
+	    kdDebug(30502) << "XFIGImportFactory: parent does not inherit KoFilter" << endl;
 	    return 0L;
     }
-    XFIGImport *f = new XFIGImport((KoFilter*)tqparent, name);
+    XFIGImport *f = new XFIGImport((KoFilter*)parent, name);
     return f;
 }
 
diff --git a/filters/karbon/xfig/xfigimport_factory.h b/filters/karbon/xfig/xfigimport_factory.h
index b4fe1bac0..10af74a01 100644
--- a/filters/karbon/xfig/xfigimport_factory.h
+++ b/filters/karbon/xfig/xfigimport_factory.h
@@ -34,10 +34,10 @@ class XFIGImportFactory :
     Q_OBJECT
   TQ_OBJECT
 public:
-    XFIGImportFactory(TQObject* tqparent = 0, const char* name = 0);
+    XFIGImportFactory(TQObject* parent = 0, const char* name = 0);
     virtual ~XFIGImportFactory();
 
-    virtual TQObject* createObject(TQObject* tqparent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+    virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
 
     static KInstance* global();
 
diff --git a/filters/kchart/bmp/bmpexport.h b/filters/kchart/bmp/bmpexport.h
index ebba6b5df..fea800f58 100644
--- a/filters/kchart/bmp/bmpexport.h
+++ b/filters/kchart/bmp/bmpexport.h
@@ -28,7 +28,7 @@ class BmpExport : public ImageExport
   TQ_OBJECT
 
 public:
-    BmpExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    BmpExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~BmpExport();
     virtual bool saveImage( TQString fileName);
     virtual void extraImageAttribute();
diff --git a/filters/kchart/jpeg/jpegexport.h b/filters/kchart/jpeg/jpegexport.h
index 2498fb31d..af88462cc 100644
--- a/filters/kchart/jpeg/jpegexport.h
+++ b/filters/kchart/jpeg/jpegexport.h
@@ -28,7 +28,7 @@ class JpegExport : public ImageExport
   TQ_OBJECT
 
 public:
-    JpegExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    JpegExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~JpegExport();
     virtual bool saveImage( TQString fileName);
     virtual void extraImageAttribute();
diff --git a/filters/kchart/libimageexport/imageexport.h b/filters/kchart/libimageexport/imageexport.h
index 4aa0e5f47..825b01567 100644
--- a/filters/kchart/libimageexport/imageexport.h
+++ b/filters/kchart/libimageexport/imageexport.h
@@ -29,7 +29,7 @@ class ImageExport : public KoFilter
   TQ_OBJECT
 
 public:
-    ImageExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    ImageExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~ImageExport();
 
     virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/kchart/mng/mngexport.h b/filters/kchart/mng/mngexport.h
index 025be07c5..6d6b2209b 100644
--- a/filters/kchart/mng/mngexport.h
+++ b/filters/kchart/mng/mngexport.h
@@ -28,7 +28,7 @@ class MngExport : public ImageExport
   TQ_OBJECT
 
 public:
-    MngExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    MngExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~MngExport();
     virtual bool saveImage( TQString fileName);
     virtual void extraImageAttribute();
diff --git a/filters/kchart/png/pngexport.h b/filters/kchart/png/pngexport.h
index 4953f44f3..c3921b964 100644
--- a/filters/kchart/png/pngexport.h
+++ b/filters/kchart/png/pngexport.h
@@ -28,7 +28,7 @@ class PngExport : public ImageExport
   TQ_OBJECT
 
 public:
-    PngExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    PngExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~PngExport();
     virtual bool saveImage( TQString fileName);
     virtual void extraImageAttribute();
diff --git a/filters/kchart/svg/svgexport.h b/filters/kchart/svg/svgexport.h
index 1ec2f61e8..c04c0f22a 100644
--- a/filters/kchart/svg/svgexport.h
+++ b/filters/kchart/svg/svgexport.h
@@ -28,7 +28,7 @@ class SvgExport : public KoFilter
   TQ_OBJECT
 
 public:
-    SvgExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    SvgExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~SvgExport();
 
     virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/kchart/xbm/xbmexport.h b/filters/kchart/xbm/xbmexport.h
index a5b466d91..cf64f69e6 100644
--- a/filters/kchart/xbm/xbmexport.h
+++ b/filters/kchart/xbm/xbmexport.h
@@ -28,7 +28,7 @@ class XbmExport : public ImageExport
   TQ_OBJECT
 
 public:
-    XbmExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    XbmExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~XbmExport();
     virtual bool saveImage( TQString fileName);
     virtual void extraImageAttribute();
diff --git a/filters/kchart/xpm/xpmexport.h b/filters/kchart/xpm/xpmexport.h
index 67acdc7a2..2c50c216e 100644
--- a/filters/kchart/xpm/xpmexport.h
+++ b/filters/kchart/xpm/xpmexport.h
@@ -28,7 +28,7 @@ class XpmExport : public ImageExport
   TQ_OBJECT
 
 public:
-    XpmExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    XpmExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~XpmExport();
     virtual bool saveImage( TQString fileName);
     virtual void extraImageAttribute();
diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc
index b280df1ca..77488fa9d 100644
--- a/filters/kformula/latex/latexexport.cc
+++ b/filters/kformula/latex/latexexport.cc
@@ -40,7 +40,7 @@ typedef KGenericFactory<LATEXExport, KoFilter> LATEXExportFactory;
 K_EXPORT_COMPONENT_FACTORY( libkfolatexexport, LATEXExportFactory( "kofficefilters" ) )
 
 
-LATEXExport::LATEXExport( KoFilter */*tqparent*/, const char */*name*/, const TQStringList& )
+LATEXExport::LATEXExport( KoFilter */*parent*/, const char */*name*/, const TQStringList& )
     : KoFilter()
 {
 }
diff --git a/filters/kformula/latex/latexexport.h b/filters/kformula/latex/latexexport.h
index 1da761bef..091ed125a 100644
--- a/filters/kformula/latex/latexexport.h
+++ b/filters/kformula/latex/latexexport.h
@@ -30,7 +30,7 @@ class LATEXExport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    LATEXExport( KoFilter *tqparent, const char *name, const TQStringList& );
+    LATEXExport( KoFilter *parent, const char *name, const TQStringList& );
     virtual ~LATEXExport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc
index 667c18ef3..507c13a21 100644
--- a/filters/kformula/mathml/mathmlexport.cc
+++ b/filters/kformula/mathml/mathmlexport.cc
@@ -40,7 +40,7 @@ typedef KGenericFactory<MathMLExport, KoFilter> MathMLExportFactory;
 K_EXPORT_COMPONENT_FACTORY( libkfomathmlexport, MathMLExportFactory( "kofficefilters" ) )
 
 
-MathMLExport::MathMLExport( KoFilter */*tqparent*/, const char */*name*/, const TQStringList& )
+MathMLExport::MathMLExport( KoFilter */*parent*/, const char */*name*/, const TQStringList& )
     : KoFilter()
 {
 }
diff --git a/filters/kformula/mathml/mathmlexport.h b/filters/kformula/mathml/mathmlexport.h
index 7f3eee19f..a49b837bb 100644
--- a/filters/kformula/mathml/mathmlexport.h
+++ b/filters/kformula/mathml/mathmlexport.h
@@ -30,7 +30,7 @@ class MathMLExport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    MathMLExport( KoFilter *tqparent, const char *name, const TQStringList& );
+    MathMLExport( KoFilter *parent, const char *name, const TQStringList& );
     virtual ~MathMLExport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kformula/mathml/mathmlimport.h b/filters/kformula/mathml/mathmlimport.h
index b1d1152f9..a4a28e180 100644
--- a/filters/kformula/mathml/mathmlimport.h
+++ b/filters/kformula/mathml/mathmlimport.h
@@ -33,7 +33,7 @@ class MathMLImport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    MathMLImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    MathMLImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~MathMLImport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc
index b8d0f3d3d..c6d3611ef 100644
--- a/filters/kformula/png/pngexport.cc
+++ b/filters/kformula/png/pngexport.cc
@@ -40,7 +40,7 @@ typedef KGenericFactory<PNGExport, KoFilter> PNGExportFactory;
 K_EXPORT_COMPONENT_FACTORY( libkfopngexport, PNGExportFactory( "kofficefilters" ) )
 
 
-PNGExport::PNGExport( KoFilter */*tqparent*/, const char */*name*/, const TQStringList& )
+PNGExport::PNGExport( KoFilter */*parent*/, const char */*name*/, const TQStringList& )
     : KoFilter()
 {
 }
diff --git a/filters/kformula/png/pngexport.h b/filters/kformula/png/pngexport.h
index 54c121e32..8dd3de342 100644
--- a/filters/kformula/png/pngexport.h
+++ b/filters/kformula/png/pngexport.h
@@ -30,7 +30,7 @@ class PNGExport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    PNGExport( KoFilter *tqparent, const char *name, const TQStringList& );
+    PNGExport( KoFilter *parent, const char *name, const TQStringList& );
     virtual ~PNGExport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc
index e366882ce..fb0407e0f 100644
--- a/filters/kformula/png/pngexportdia.cc
+++ b/filters/kformula/png/pngexportdia.cc
@@ -39,8 +39,8 @@
 #include "pngexportdia.h"
 #include <knuminput.h>
 
-PNGExportDia::PNGExportDia( const TQDomDocument &dom, const TQString &outFile, TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name, true, i18n("PNG Export Filter Parameters" ), Ok|Cancel ),
+PNGExportDia::PNGExportDia( const TQDomDocument &dom, const TQString &outFile, TQWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n("PNG Export Filter Parameters" ), Ok|Cancel ),
       _fileOut( outFile )
 {
     kapp->restoreOverrideCursor();
diff --git a/filters/kformula/png/pngexportdia.h b/filters/kformula/png/pngexportdia.h
index 4d04d429e..4a1795be0 100644
--- a/filters/kformula/png/pngexportdia.h
+++ b/filters/kformula/png/pngexportdia.h
@@ -41,7 +41,7 @@ class PNGExportDia : public KDialogBase
   TQ_OBJECT
 
 public:
-    PNGExportDia( const TQDomDocument &dom, const TQString &outFile, TQWidget *tqparent=0L, const char *name=0L );
+    PNGExportDia( const TQDomDocument &dom, const TQString &outFile, TQWidget *parent=0L, const char *name=0L );
     ~PNGExportDia();
 
 public slots:
diff --git a/filters/kformula/svg/svgexport.h b/filters/kformula/svg/svgexport.h
index 98d4d8d42..65a5cef14 100644
--- a/filters/kformula/svg/svgexport.h
+++ b/filters/kformula/svg/svgexport.h
@@ -29,7 +29,7 @@ class SvgExport : public KoFilter
   TQ_OBJECT
 
 public:
-    SvgExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    SvgExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~SvgExport();
 
     virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/kivio/imageexport/kivio_imageexportdialog.cpp b/filters/kivio/imageexport/kivio_imageexportdialog.cpp
index b4e8348b3..8ce557f62 100644
--- a/filters/kivio/imageexport/kivio_imageexportdialog.cpp
+++ b/filters/kivio/imageexport/kivio_imageexportdialog.cpp
@@ -31,8 +31,8 @@
 namespace Kivio
 {
 
-ImageExportDialog::ImageExportDialog(TQWidget* tqparent, const char* name)
-  : KDialogBase(tqparent, name, false, i18n("Export to Image"), Ok|Cancel)
+ImageExportDialog::ImageExportDialog(TQWidget* parent, const char* name)
+  : KDialogBase(parent, name, false, i18n("Export to Image"), Ok|Cancel)
 {
   kapp->restoreOverrideCursor();
   m_mainWidget = new ImageExportWidget(this);
diff --git a/filters/kivio/imageexport/kivio_imageexportdialog.h b/filters/kivio/imageexport/kivio_imageexportdialog.h
index da005e0c5..37615db71 100644
--- a/filters/kivio/imageexport/kivio_imageexportdialog.h
+++ b/filters/kivio/imageexport/kivio_imageexportdialog.h
@@ -32,7 +32,7 @@ class ImageExportDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    ImageExportDialog(TQWidget* tqparent = 0, const char* name = 0);
+    ImageExportDialog(TQWidget* parent = 0, const char* name = 0);
 
     void setPageList(const TQStringList& pages);
     void setInitialDPI(const int dpi);
diff --git a/filters/kpresenter/bmp/bmpexport.h b/filters/kpresenter/bmp/bmpexport.h
index f266f6361..7d8d3ba1a 100644
--- a/filters/kpresenter/bmp/bmpexport.h
+++ b/filters/kpresenter/bmp/bmpexport.h
@@ -28,7 +28,7 @@ class BmpExport : public ImageExport
   TQ_OBJECT
 
 public:
-    BmpExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    BmpExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~BmpExport();
     virtual bool saveImage( TQString fileName);
     virtual bool extraImageAttribute();
diff --git a/filters/kpresenter/jpeg/jpegexport.h b/filters/kpresenter/jpeg/jpegexport.h
index 518615dfa..18cb8dc83 100644
--- a/filters/kpresenter/jpeg/jpegexport.h
+++ b/filters/kpresenter/jpeg/jpegexport.h
@@ -28,7 +28,7 @@ class JpegExport : public ImageExport
   TQ_OBJECT
 
 public:
-    JpegExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    JpegExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~JpegExport();
     virtual bool saveImage( TQString fileName);
     virtual bool extraImageAttribute();
diff --git a/filters/kpresenter/kword/kprkword.h b/filters/kpresenter/kword/kprkword.h
index 0ba4efa59..f4141a097 100644
--- a/filters/kpresenter/kword/kprkword.h
+++ b/filters/kpresenter/kword/kprkword.h
@@ -29,7 +29,7 @@ class KprKword : public KoFilter {
   TQ_OBJECT
 
 public:
-    KprKword(KoFilter *tqparent, const char *name, const TQStringList&);
+    KprKword(KoFilter *parent, const char *name, const TQStringList&);
 
     virtual ~KprKword() {}
 
diff --git a/filters/kpresenter/libimageexport/imageexport.h b/filters/kpresenter/libimageexport/imageexport.h
index 641a90104..23f45e28d 100644
--- a/filters/kpresenter/libimageexport/imageexport.h
+++ b/filters/kpresenter/libimageexport/imageexport.h
@@ -29,7 +29,7 @@ class ImageExport : public KoFilter
   TQ_OBJECT
 
 public:
-    ImageExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    ImageExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~ImageExport();
 
     virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py
index e57169896..e2e5b50aa 100755
--- a/filters/kpresenter/magicpoint/mgp2kpr.py
+++ b/filters/kpresenter/magicpoint/mgp2kpr.py
@@ -176,7 +176,7 @@ class MgpImporter:
       self.tqalignment="1" #left
     #print self.tqalignment
 
-  def __setBackground(self,tqparent):
+  def __setBackground(self,parent):
     pageElem=self.document.createElement("PAGE")
 
     elem=self.document.createElement("BACKTYPE")   #color
@@ -200,9 +200,9 @@ class MgpImporter:
       elem.setAttribute("color", self.color2)
       pageElem.appendChild(elem)
 
-    tqparent.appendChild(pageElem)
+    parent.appendChild(pageElem)
 
-  def __handlePage(self,tqparent,bgParent):
+  def __handlePage(self,parent,bgParent):
     if (self.pageCount!=-1):
       self.__setBackground(bgParent) #set the background for this page
       
@@ -224,7 +224,7 @@ class MgpImporter:
     ### para comes here
       
     objElem.appendChild(self.textElem)
-    tqparent.appendChild(objElem)
+    parent.appendChild(objElem)
 
     self.useDefaults=1
     self.__reset()
@@ -314,7 +314,7 @@ class MgpImporter:
       length=PAGE_WIDTH
       
 
-  def __setPaper(self,tqparent):
+  def __setPaper(self,parent):
     paperElem=self.document.createElement("PAPER")
     paperElem.setAttribute("ptWidth", str(PAGE_WIDTH))
     paperElem.setAttribute("ptHeight", str(Y_OFFSET))
@@ -330,7 +330,7 @@ class MgpImporter:
 
     paperElem.appendChild(borderElem)
     
-    tqparent.appendChild(paperElem)
+    parent.appendChild(paperElem)
 
   def convert(self, fileIn, fileOut=None):
     """Parses the Magicpoint document and returns a KPresenter XML document.
diff --git a/filters/kpresenter/mng/mngexport.h b/filters/kpresenter/mng/mngexport.h
index 6e5f9d4ad..d19e62846 100644
--- a/filters/kpresenter/mng/mngexport.h
+++ b/filters/kpresenter/mng/mngexport.h
@@ -28,7 +28,7 @@ class MngExport : public ImageExport
   TQ_OBJECT
 
 public:
-    MngExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    MngExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~MngExport();
     virtual bool saveImage( TQString fileName);
     virtual bool extraImageAttribute();
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.h b/filters/kpresenter/ooimpress/ooimpressexport.h
index 3b1e7b797..ac3691928 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.h
+++ b/filters/kpresenter/ooimpress/ooimpressexport.h
@@ -34,7 +34,7 @@ class OoImpressExport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    OoImpressExport( KoFilter * tqparent, const char * name, const TQStringList & );
+    OoImpressExport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoImpressExport();
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString & from,
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc
index cf853deae..1dab566df 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressimport.cc
@@ -1517,10 +1517,10 @@ TQDomElement OoImpressImport::parseTextBox( TQDomDocument& doc, const TQDomEleme
     return textObjectElement;
 }
 
-void OoImpressImport::parseParagraphs( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& tqparent )
+void OoImpressImport::parseParagraphs( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& parent )
 {
     TQDomElement t;
-    forEachElement( t, tqparent )
+    forEachElement( t, parent )
     {
         m_styleStack.save();
         const TQString localName = t.localName();
@@ -1707,12 +1707,12 @@ TQDomElement OoImpressImport::parseParagraph( TQDomDocument& doc, const TQDomEle
     return p;
 }
 
-void OoImpressImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& tqparent,
+void OoImpressImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& parent,
     TQDomElement& outputParagraph, uint& pos)
 {
-    // Parse every child node of the tqparent
+    // Parse every child node of the parent
     // Can't use forEachElement here since we also care about text nodes
-    for( TQDomNode node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() )
+    for( TQDomNode node = parent.firstChild(); !node.isNull(); node = node.nextSibling() )
     {
         TQDomElement ts = node.toElement();
         TQString textData;
@@ -2029,11 +2029,11 @@ void OoImpressImport::fillStyleStack( const TQDomElement& object, bool sticky )
 void OoImpressImport::addStyles( const TQDomElement* style )
 {
     kdDebug(30518)<<" addStyle :" << style->attributeNS( ooNS::style, "name", TQString() ) <<endl;
-    // this function is necessary as tqparent styles can have parents themself
-    if ( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) )
+    // this function is necessary as parent styles can have parents themself
+    if ( style->hasAttributeNS( ooNS::style, "parent-style-name" ) )
     {
-        //kdDebug(30518)<<"m_styles[style->attribute( style:tqparent-style-name )] :"<<m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )]<<endl;
-        addStyles( m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )] );
+        //kdDebug(30518)<<"m_styles[style->attribute( style:parent-style-name )] :"<<m_styles[style->attributeNS( ooNS::style, "parent-style-name", TQString() )]<<endl;
+        addStyles( m_styles[style->attributeNS( ooNS::style, "parent-style-name", TQString() )] );
     }
     //kdDebug(30518)<<" void OoImpressImport::addStyles( const TQDomElement* style ) :"<<style<<endl;
     m_styleStack.push( *style );
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.h b/filters/kpresenter/ooimpress/ooimpressimport.h
index 26d494205..596ca703b 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.h
+++ b/filters/kpresenter/ooimpress/ooimpressimport.h
@@ -43,7 +43,7 @@ class OoImpressImport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    OoImpressImport( KoFilter * tqparent, const char * name, const TQStringList & );
+    OoImpressImport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoImpressImport();
 
     virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
@@ -91,7 +91,7 @@ private:
     void parseList( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& list );
     void parseParagraphs( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& textBox );
     TQDomElement parseParagraph( TQDomDocument& doc, const TQDomElement& paragraph );
-    void parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& tqparent,
+    void parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& parent,
                              TQDomElement& outputParagraph, uint& pos);
     bool parseSettings( TQDomDocument &doc, TQDomElement &helpLineElement, TQDomElement &attributeElement );
     void parseHelpLine( TQDomDocument &doc,TQDomElement &helpLineElement, const TQString &text );
diff --git a/filters/kpresenter/ooimpress/stylefactory.cc b/filters/kpresenter/ooimpress/stylefactory.cc
index 18ce339bf..a25ba52aa 100644
--- a/filters/kpresenter/ooimpress/stylefactory.cc
+++ b/filters/kpresenter/ooimpress/stylefactory.cc
@@ -1208,7 +1208,7 @@ void GraphicStyle::toXML( TQDomDocument & doc, TQDomElement & e ) const
     style.setAttribute( "style:name", m_name );
     style.setAttribute( "style:family", "graphics" );
     if ( m_name != "standard" )
-        style.setAttribute( "style:tqparent-style-name", "standard" );
+        style.setAttribute( "style:parent-style-name", "standard" );
 
     TQDomElement properties = doc.createElement( "style:properties" );
     if ( !m_stroke.isNull() )
diff --git a/filters/kpresenter/png/pngexport.h b/filters/kpresenter/png/pngexport.h
index 692aa76af..e86ac95fb 100644
--- a/filters/kpresenter/png/pngexport.h
+++ b/filters/kpresenter/png/pngexport.h
@@ -28,7 +28,7 @@ class PngExport : public ImageExport
   TQ_OBJECT
 
 public:
-    PngExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    PngExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~PngExport();
     virtual bool saveImage( TQString fileName);
     virtual bool extraImageAttribute();
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc
index 6afdc659b..4f41aac7e 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc
@@ -1455,7 +1455,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:name", styleName );
   xmlWriter->addAttribute( "style:family", "graphic" );
-  xmlWriter->addAttribute( "style:tqparent-style-name", "standard" );
+  xmlWriter->addAttribute( "style:parent-style-name", "standard" );
 
     xmlWriter->startElement( "style:graphic-properties" );
 /*
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.h b/filters/kpresenter/powerpoint/import/powerpointimport.h
index 5c3a73bca..ca3e7365d 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.h
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.h
@@ -37,7 +37,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-  PowerPointImport ( TQObject *tqparent, const char* name, const TQStringList& );
+  PowerPointImport ( TQObject *parent, const char* name, const TQStringList& );
   virtual ~PowerPointImport();
   virtual KoFilter::ConversiontqStatus convert( const TQCString& from, 
         const TQCString& to );
diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp
index daab8ff9a..b905539d4 100644
--- a/filters/kpresenter/powerpoint/libppt/pole.cpp
+++ b/filters/kpresenter/powerpoint/libppt/pole.cpp
@@ -113,7 +113,7 @@ class DirTree
     DirEntry* entry( unsigned index );
     DirEntry* entry( const std::string& name, bool create=false );
     int indexOf( DirEntry* e );
-    int tqparent( unsigned index );
+    int parent( unsigned index );
     std::string fullName( unsigned index );
     std::vector<unsigned> tqchildren( unsigned index );
     void load( unsigned char* buffer, unsigned len );
@@ -503,7 +503,7 @@ int DirTree::indexOf( DirEntry* e )
   return -1;
 }
 
-int DirTree::tqparent( unsigned index )
+int DirTree::parent( unsigned index )
 {
   // brute-force, basically we iterate for each entries, find its tqchildren
   // and check if one of the tqchildren is 'index'
@@ -525,7 +525,7 @@ std::string DirTree::fullName( unsigned index )
 
   std::string result = entry( index )->name;
   result.insert( 0,  "/" );
-  int p = tqparent( index );
+  int p = parent( index );
   DirEntry * _entry = 0;
   while( p > 0 )
   {
@@ -593,7 +593,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
        if( !create ) return (DirEntry*)0;
        
        // create a new entry
-       unsigned tqparent = index;
+       unsigned parent = index;
        entries.push_back( DirEntry() );
        index = entryCount()-1;
        DirEntry* e = entry( index );
@@ -604,8 +604,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
        e->start = 0;
        e->child = End;
        e->prev = End;
-       e->next = entry(tqparent)->child;
-       entry(tqparent)->child = index;
+       e->next = entry(parent)->child;
+       entry(parent)->child = index;
      }
    }
 
@@ -1102,7 +1102,7 @@ StreamIO::StreamIO( StorageIO* s, DirEntry* e)
   updateCache();
 }
 
-// FIXME tell tqparent we're gone
+// FIXME tell parent we're gone
 StreamIO::~StreamIO()
 {
   delete[] cache_data;  
@@ -1248,8 +1248,8 @@ std::list<std::string> Storage::entries( const std::string& path )
   DirEntry* e = dt->entry( path, false );
   if( e  && e->dir )
   {
-    unsigned tqparent = dt->indexOf( e );
-    std::vector<unsigned> tqchildren = dt->tqchildren( tqparent );
+    unsigned parent = dt->indexOf( e );
+    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
     for( unsigned i = 0; i < tqchildren.size(); i++ )
       result.push_back( dt->entry( tqchildren[i] )->name );
   }
@@ -1270,7 +1270,7 @@ Stream::Stream( Storage* storage, const std::string& name )
   io = storage->io->streamIO( name );
 }
 
-// FIXME tell tqparent we're gone
+// FIXME tell parent we're gone
 Stream::~Stream()
 {
   delete io;
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
index 04fb4a407..bf3fc51fa 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
@@ -394,12 +394,12 @@ Record* Record::create( unsigned type )
 return record;
 }
 
-void Record::setParent( Record* tqparent )
+void Record::setParent( Record* parent )
 {
-  record_parent = tqparent;
+  record_parent = parent;
 }
 
-const Record* Record::tqparent() const
+const Record* Record::parent() const
 {
   return record_parent;
 }
@@ -3088,10 +3088,10 @@ void StyleTextPropAtom::setData( unsigned /*size*/, const unsigned char* data, u
       atomData.charCount = charCount;
       atomData.depth = readU16(data+k); 
       k += 2; 
-      unsigned tqmask = readU32(data+6); 
+      unsigned mask = readU32(data+6); 
       k += 4;        
 
-      if ( tqmask & 0xF )
+      if ( mask & 0xF )
       { 
         int bulletFlag = readU16(data+k);
         k += 2;
@@ -3100,99 +3100,99 @@ void StyleTextPropAtom::setData( unsigned /*size*/, const unsigned char* data, u
         atomData.bulletHardColor = ( bulletFlag & 4 ) ? 1 : 0;  
       }    
 
-      if ( tqmask & 0x0080 )
+      if ( mask & 0x0080 )
       {
         atomData.bulletChar = readU16(data+k);
         k += 2; 
       } 
       
-      if ( tqmask & 0x0010 )
+      if ( mask & 0x0010 )
       { 
         atomData.bulletFont = readU16(data+k);
         k += 2; 
       }
 
-      if ( tqmask & 0x0040 )
+      if ( mask & 0x0040 )
       {
         atomData.bulletHeight = readU16(data+k);
         k += 2; 
       }
 
-      if ( tqmask & 0x0020 )
+      if ( mask & 0x0020 )
       { 
         atomData.bulletColor = readU32(data+k);
         k += 4; 
       }
 
-      if ( tqmask & 0x0F00 )
+      if ( mask & 0x0F00 )
       { 
-        if ( tqmask & 0x800 )
+        if ( mask & 0x800 )
         {
           unsigned dummy = readU16(data+k);
           atomData.align = ( dummy & 3 );
           k += 2;
         }                                             
-        if ( tqmask & 0x400 )
+        if ( mask & 0x400 )
         {
           /*unsigned dummy =*/ readU16(data+k);
           k += 2;
         }
-        if ( tqmask & 0x200 )
+        if ( mask & 0x200 )
         {
           /*unsigned dummy =*/ readU16(data+k);
           k += 2;
         }      
-        if ( tqmask & 0x100 )
+        if ( mask & 0x100 )
         {
           /*unsigned dummy =*/ readU16(data+k);
           k += 2;
         }      
       }
 
-      if ( tqmask & 0x1000 ) 
+      if ( mask & 0x1000 ) 
       { 
         atomData.lineFeed = readU16(data+k);
         k += 2; 
       }    
  
-      if ( tqmask & 0x2000 ) 
+      if ( mask & 0x2000 ) 
       {
         atomData.upperDist = readU16(data+k);
         k += 2; 
       }   
 
-      if ( tqmask & 0x4000 ) 
+      if ( mask & 0x4000 ) 
       {
         atomData.lowerDist = readU16(data+k);
         k += 2; 
       }  
 
-      if ( tqmask & 0x8000 ) 
+      if ( mask & 0x8000 ) 
       {
         /*unsigned dummy =*/ readU16(data+k);
         k += 2; 
       }   
       
-      if ( tqmask & 0x10000 ) 
+      if ( mask & 0x10000 ) 
       {
         /*unsigned dummy =*/ readU16(data+k);
         k += 2; 
       }   
 
-      if ( tqmask & 0xe0000 )
+      if ( mask & 0xe0000 )
       {
         unsigned dummy = readU16(data+k);
-        if ( tqmask & 0x20000 )
+        if ( mask & 0x20000 )
           atomData.asianLB1 = dummy & 1;
-        if ( tqmask & 0x40000 )
+        if ( mask & 0x40000 )
           atomData.asianLB2 = (dummy >> 1) & 1;
-        if ( tqmask & 0x80000 )
+        if ( mask & 0x80000 )
           atomData.asianLB3 = (dummy >> 2) & 1;
 
         k += 2; 
       }    
 
-      if ( tqmask & 0x200000 ) 
+      if ( mask & 0x200000 ) 
       {
         atomData.biDi = readU16(data+k);
         k += 2;       
@@ -5453,7 +5453,7 @@ int PPTReader::indexPersistence( unsigned long ofs )
   return 0;
 }
 
-void PPTReader::loadRecord( Record* tqparent )
+void PPTReader::loadRecord( Record* parent )
 {
   // FIXME
   unsigned char buffer[65536];
@@ -5472,7 +5472,7 @@ void PPTReader::loadRecord( Record* tqparent )
   Record* record = Record::create( type );
   if( record )
   {
-    record->setParent( tqparent );
+    record->setParent( parent );
     record->setPosition( pos );
     record->setInstance( instance );
 
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.h b/filters/kpresenter/powerpoint/libppt/powerpoint.h
index 66143a528..6eec1564e 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.h
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h
@@ -63,9 +63,9 @@ public:
    */
   virtual bool isContainer() const { return false; }
   
-  void setParent( Record* tqparent );
+  void setParent( Record* parent );
   
-  const Record* tqparent() const;
+  const Record* parent() const;
 
   /**
     Sets the data for this record.
@@ -2497,7 +2497,7 @@ protected:
   void loadDocument();
   int indexPersistence( unsigned long offset );
 
-  void loadRecord( Record* tqparent );
+  void loadRecord( Record* parent );
   void handleRecord( Record* record, int type );
   void handleContainer( Container* container, int type, unsigned size );
 
diff --git a/filters/kpresenter/svg/svgexport.h b/filters/kpresenter/svg/svgexport.h
index a11b20c22..eafdd792b 100644
--- a/filters/kpresenter/svg/svgexport.h
+++ b/filters/kpresenter/svg/svgexport.h
@@ -29,7 +29,7 @@ class SvgExport : public KoFilter
   TQ_OBJECT
 
 public:
-    SvgExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    SvgExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~SvgExport();
 
     virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/kpresenter/xbm/xbmexport.h b/filters/kpresenter/xbm/xbmexport.h
index 9079f9504..cb64945f9 100644
--- a/filters/kpresenter/xbm/xbmexport.h
+++ b/filters/kpresenter/xbm/xbmexport.h
@@ -28,7 +28,7 @@ class XbmExport : public ImageExport
   TQ_OBJECT
 
 public:
-    XbmExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    XbmExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~XbmExport();
     virtual bool saveImage( TQString fileName);
     virtual bool extraImageAttribute();
diff --git a/filters/kpresenter/xpm/xpmexport.h b/filters/kpresenter/xpm/xpmexport.h
index 14b14b6c8..f7a1c95cc 100644
--- a/filters/kpresenter/xpm/xpmexport.h
+++ b/filters/kpresenter/xpm/xpmexport.h
@@ -28,7 +28,7 @@ class XpmExport : public ImageExport
   TQ_OBJECT
 
 public:
-    XpmExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    XpmExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~XpmExport();
     virtual bool saveImage( TQString fileName);
     virtual bool extraImageAttribute();
diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc
index ab3201c8a..a75cccacc 100644
--- a/filters/kspread/applixspread/applixspreadimport.cc
+++ b/filters/kspread/applixspread/applixspreadimport.cc
@@ -37,7 +37,7 @@ typedef KGenericFactory<APPLIXSPREADImport, KoFilter> APPLIXSPREADImportFactory;
 K_EXPORT_COMPONENT_FACTORY( libapplixspreadimport, APPLIXSPREADImportFactory( "kofficefilters" ) )
 
 
-APPLIXSPREADImport::APPLIXSPREADImport ( TQObject */*tqparent*/, const char* /*name*/, const TQStringList& )
+APPLIXSPREADImport::APPLIXSPREADImport ( TQObject */*parent*/, const char* /*name*/, const TQStringList& )
     : KoFilter()
 {
 }
diff --git a/filters/kspread/applixspread/applixspreadimport.h b/filters/kspread/applixspread/applixspreadimport.h
index 048a22e73..78deb2ca6 100644
--- a/filters/kspread/applixspread/applixspreadimport.h
+++ b/filters/kspread/applixspread/applixspreadimport.h
@@ -54,7 +54,7 @@ class APPLIXSPREADImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    APPLIXSPREADImport ( TQObject *tqparent, const char* name, const TQStringList& );
+    APPLIXSPREADImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~APPLIXSPREADImport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index 47cb19fe6..17e9cc65a 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -41,8 +41,8 @@
 #include <kmessagebox.h>
 #include <kcharsets.h>
 
-CSVDialog::CSVDialog(TQWidget* tqparent, TQByteArray& fileArray, const TQString /*seperator*/)
-    : KDialogBase(tqparent, 0, true, TQString(), Ok|Cancel, No, true),
+CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*seperator*/)
+    : KDialogBase(parent, 0, true, TQString(), Ok|Cancel, No, true),
       m_adjustRows(false),
       m_adjustCols(false),
       m_startRow(0),
@@ -612,7 +612,7 @@ TQTextCodec* CSVDialog::getCodec(void) const
     {
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
-        // ### TODO: what tqparent to use?
+        // ### TODO: what parent to use?
         KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
diff --git a/filters/kspread/csv/csvdialog.h b/filters/kspread/csv/csvdialog.h
index 685bbf37a..eefb94073 100644
--- a/filters/kspread/csv/csvdialog.h
+++ b/filters/kspread/csv/csvdialog.h
@@ -42,7 +42,7 @@ public:
         POINTNUMBER ///< Number, which decimal symbol is a point/dot
     };
 
-    CSVDialog(TQWidget* tqparent, TQByteArray& fileArray, const TQString seperator);
+    CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString seperator);
     ~CSVDialog();
 
     int getRows();
diff --git a/filters/kspread/csv/csvexport.h b/filters/kspread/csv/csvexport.h
index 53fd9efef..decdb81cf 100644
--- a/filters/kspread/csv/csvexport.h
+++ b/filters/kspread/csv/csvexport.h
@@ -35,7 +35,7 @@ class CSVExport : public KoFilter
   TQ_OBJECT
 
   public:
-  CSVExport(KoFilter * tqparent, const char * name, const TQStringList &);
+  CSVExport(KoFilter * parent, const char * name, const TQStringList &);
   virtual ~CSVExport() {}
 
   virtual KoFilter::ConversiontqStatus convert( const TQCString & from, const TQCString & to );
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index 268f322b6..a4ef13472 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -48,8 +48,8 @@
 
 using namespace KSpread;
 
-CSVExportDialog::CSVExportDialog( TQWidget * tqparent )
-  : KDialogBase( tqparent, 0, true, TQString(), Ok | Cancel, No, true ),
+CSVExportDialog::CSVExportDialog( TQWidget * parent )
+  : KDialogBase( parent, 0, true, TQString(), Ok | Cancel, No, true ),
     m_dialog( new ExportDialogUI( this ) ),
     m_delimiter( "," ),
     m_textquote('"')
@@ -305,7 +305,7 @@ TQTextCodec* CSVExportDialog::getCodec(void) const
     {
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
-        // ### TODO: what tqparent to use?
+        // ### TODO: what parent to use?
         KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
diff --git a/filters/kspread/csv/csvexportdialog.h b/filters/kspread/csv/csvexportdialog.h
index aa350f018..4683c040b 100644
--- a/filters/kspread/csv/csvexportdialog.h
+++ b/filters/kspread/csv/csvexportdialog.h
@@ -36,7 +36,7 @@ class CSVExportDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
  public:
-  CSVExportDialog(TQWidget * tqparent);
+  CSVExportDialog(TQWidget * parent);
   ~CSVExportDialog();
 
   TQChar   getDelimiter() const;
diff --git a/filters/kspread/csv/csvimport.h b/filters/kspread/csv/csvimport.h
index 6f01a7347..df14a7564 100644
--- a/filters/kspread/csv/csvimport.h
+++ b/filters/kspread/csv/csvimport.h
@@ -28,7 +28,7 @@ class CSVFilter : public KoFilter {
   TQ_OBJECT
 
 public:
-    CSVFilter(KoFilter *tqparent, const char *name, const TQStringList&);
+    CSVFilter(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~CSVFilter() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kspread/dbase/dbaseimport.h b/filters/kspread/dbase/dbaseimport.h
index 8d074f1e5..39a0ac0e9 100644
--- a/filters/kspread/dbase/dbaseimport.h
+++ b/filters/kspread/dbase/dbaseimport.h
@@ -30,7 +30,7 @@ class DBaseImport : public KoFilter {
 
 public:
 
-    DBaseImport ( TQObject *tqparent, const char* name, const TQStringList& );
+    DBaseImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~DBaseImport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kspread/excel/excelexport.h b/filters/kspread/excel/excelexport.h
index 946a1b090..029cdac15 100644
--- a/filters/kspread/excel/excelexport.h
+++ b/filters/kspread/excel/excelexport.h
@@ -13,7 +13,7 @@ class ExcelExport : public KoFilter {
   TQ_OBJECT
 
 public:
-	ExcelExport(KoFilter *tqparent, const char*name, const TQStringList&);
+	ExcelExport(KoFilter *parent, const char*name, const TQStringList&);
 	virtual ~ExcelExport() {}
 
 	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/kspread/excel/import/excelimport.h b/filters/kspread/excel/import/excelimport.h
index 77e7b7475..5b7337330 100644
--- a/filters/kspread/excel/import/excelimport.h
+++ b/filters/kspread/excel/import/excelimport.h
@@ -32,7 +32,7 @@ class ExcelImport : public KoFilter {
 
 public:
 
-    ExcelImport ( TQObject *tqparent, const char* name, const TQStringList& );
+    ExcelImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~ExcelImport();
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h
index c114aa803..8cbdfd538 100644
--- a/filters/kspread/excel/sidewinder/excel.h
+++ b/filters/kspread/excel/sidewinder/excel.h
@@ -2777,7 +2777,7 @@ public:
   void setFormulaHidden( bool f );
   
   /**
-   * Returns the index of the tqparent stlye of this format.
+   * Returns the index of the parent stlye of this format.
    * This refers to the index of the XFormat table which is constructed 
    * from a series of XFormat records.
    *
@@ -2786,7 +2786,7 @@ public:
   unsigned parentStyle() const;
   
   /**
-   * Sets the index of the tqparent stlye of this format.
+   * Sets the index of the parent stlye of this format.
    * This refers to the index of the XFormat table which is constructed 
    * from a series of XFormat records.
    *
diff --git a/filters/kspread/excel/sidewinder/pole.cpp b/filters/kspread/excel/sidewinder/pole.cpp
index fac4aa622..38fe8cb55 100644
--- a/filters/kspread/excel/sidewinder/pole.cpp
+++ b/filters/kspread/excel/sidewinder/pole.cpp
@@ -114,7 +114,7 @@ class DirTree
     DirEntry* entry( unsigned index );
     DirEntry* entry( const std::string& name, bool create=false );
     int indexOf( DirEntry* e );
-    int tqparent( unsigned index );
+    int parent( unsigned index );
     std::string fullName( unsigned index );
     std::vector<unsigned> tqchildren( unsigned index );
     void load( unsigned char* buffer, unsigned len );
@@ -507,7 +507,7 @@ int DirTree::indexOf( DirEntry* e )
   return -1;
 }
 
-int DirTree::tqparent( unsigned index )
+int DirTree::parent( unsigned index )
 {
   // brute-force, basically we iterate for each entries, find its tqchildren
   // and check if one of the tqchildren is 'index'
@@ -529,7 +529,7 @@ std::string DirTree::fullName( unsigned index )
 
   std::string result = entry( index )->name;
   result.insert( 0,  "/" );
-  int p = tqparent( index );
+  int p = parent( index );
   DirEntry * _entry = 0;
   while( p > 0 )
   {
@@ -597,7 +597,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
        if( !create ) return (DirEntry*)0;
 
        // create a new entry
-       unsigned tqparent = index;
+       unsigned parent = index;
        entries.push_back( DirEntry() );
        index = entryCount()-1;
        DirEntry* e = entry( index );
@@ -608,8 +608,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
        e->start = 0;
        e->child = End;
        e->prev = End;
-       e->next = entry(tqparent)->child;
-       entry(tqparent)->child = index;
+       e->next = entry(parent)->child;
+       entry(parent)->child = index;
      }
    }
 
@@ -1138,7 +1138,7 @@ StreamIO::StreamIO( StorageIO* s, DirEntry* e)
   updateCache();
 }
 
-// FIXME tell tqparent we're gone
+// FIXME tell parent we're gone
 StreamIO::~StreamIO()
 {
   delete[] cache_data;
@@ -1285,8 +1285,8 @@ std::list<std::string> Storage::entries( const std::string& path )
   DirEntry* e = dt->entry( path, false );
   if( e  && e->dir )
   {
-    unsigned tqparent = dt->indexOf( e );
-    std::vector<unsigned> tqchildren = dt->tqchildren( tqparent );
+    unsigned parent = dt->indexOf( e );
+    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
     for( unsigned i = 0; i < tqchildren.size(); i++ )
       result.push_back( dt->entry( tqchildren[i] )->name );
   }
@@ -1307,7 +1307,7 @@ Stream::Stream( Storage* storage, const std::string& name )
   io = storage->io->streamIO( name );
 }
 
-// FIXME tell tqparent we're gone
+// FIXME tell parent we're gone
 Stream::~Stream()
 {
   delete io;
diff --git a/filters/kspread/gnumeric/gnumericexport.h b/filters/kspread/gnumeric/gnumericexport.h
index 8cd89e382..392f0f723 100644
--- a/filters/kspread/gnumeric/gnumericexport.h
+++ b/filters/kspread/gnumeric/gnumericexport.h
@@ -34,7 +34,7 @@ class GNUMERICExport : public KoFilter {
   TQ_OBJECT
 
 public:
-    GNUMERICExport(KoFilter *tqparent, const char*name, const TQStringList&);
+    GNUMERICExport(KoFilter *parent, const char*name, const TQStringList&);
     virtual ~GNUMERICExport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kspread/gnumeric/gnumericimport.h b/filters/kspread/gnumeric/gnumericimport.h
index f5a46d104..b7fbd4bd1 100644
--- a/filters/kspread/gnumeric/gnumericimport.h
+++ b/filters/kspread/gnumeric/gnumericimport.h
@@ -36,7 +36,7 @@ class GNUMERICFilter : public KoFilter
     Q_OBJECT
   TQ_OBJECT
  public:
-    GNUMERICFilter(KoFilter *tqparent, const char *name, const TQStringList&);
+    GNUMERICFilter(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~GNUMERICFilter() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc
index 37720d6e2..72dd68755 100644
--- a/filters/kspread/html/exportdialog.cc
+++ b/filters/kspread/html/exportdialog.cc
@@ -32,8 +32,8 @@
 #include <exportdialog.h>
 #include <exportwidget.h>
 
-ExportDialog::ExportDialog( TQWidget *tqparent, const char *name )
-  : KDialogBase( tqparent, name, true, i18n("Export Sheet to HTML"), Ok|Cancel, No, true ), m_mainwidget( new ExportWidget( this ) )
+ExportDialog::ExportDialog( TQWidget *parent, const char *name )
+  : KDialogBase( parent, name, true, i18n("Export Sheet to HTML"), Ok|Cancel, No, true ), m_mainwidget( new ExportWidget( this ) )
 {
   kapp->restoreOverrideCursor();
 
diff --git a/filters/kspread/html/exportdialog.h b/filters/kspread/html/exportdialog.h
index 38cac112d..296455408 100644
--- a/filters/kspread/html/exportdialog.h
+++ b/filters/kspread/html/exportdialog.h
@@ -29,7 +29,7 @@ class ExportDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    ExportDialog( TQWidget *tqparent = 0, const char *name = 0 );
+    ExportDialog( TQWidget *parent = 0, const char *name = 0 );
     ~ExportDialog();
 
     void setSheets( const TQStringList & );
diff --git a/filters/kspread/html/htmlexport.h b/filters/kspread/html/htmlexport.h
index afb208835..09f904d38 100644
--- a/filters/kspread/html/htmlexport.h
+++ b/filters/kspread/html/htmlexport.h
@@ -36,7 +36,7 @@ class HTMLExport : public KoFilter {
     Q_OBJECT
   TQ_OBJECT
 public:
-    HTMLExport(KoFilter *tqparent, const char*name, const TQStringList&);
+    HTMLExport(KoFilter *parent, const char*name, const TQStringList&);
     virtual ~HTMLExport();
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc
index 76a44e9ab..15e8ee2ab 100644
--- a/filters/kspread/kexi/kspread_kexiimport.cc
+++ b/filters/kspread/kexi/kspread_kexiimport.cc
@@ -61,7 +61,7 @@ K_EXPORT_COMPONENT_FACTORY( libkspreadkexiimport, KSpreadKexiImportFactory( "kof
 
 //=============================================================================
 
-KSpreadKexiImport::KSpreadKexiImport(KoFilter *tqparent, const char *name, const TQStringList&)
+KSpreadKexiImport::KSpreadKexiImport(KoFilter *parent, const char *name, const TQStringList&)
 {
 }
 
diff --git a/filters/kspread/kexi/kspread_kexiimport.h b/filters/kspread/kexi/kspread_kexiimport.h
index 7da8d20f0..aec658899 100644
--- a/filters/kspread/kexi/kspread_kexiimport.h
+++ b/filters/kspread/kexi/kspread_kexiimport.h
@@ -69,7 +69,7 @@ class KSpreadKexiImport : public KoFilter
     /**
      * Constructor. This constructor is usable with KGenericFactory.
      */
-      KSpreadKexiImport(KoFilter *tqparent, const char *name, const TQStringList&);
+      KSpreadKexiImport(KoFilter *parent, const char *name, const TQStringList&);
 
     /**
      * Virtual destructor.
diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc
index 9d30ee38c..9ddf240ff 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialog.cc
+++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc
@@ -54,12 +54,12 @@
 
 /**
  * Constructor
- * @param tqparent Pointer to kspread view
+ * @param parent Pointer to kspread view
  * @param name Name of the dialog
  * @return None
  */
-    KSpreadKexiImportDialog::KSpreadKexiImportDialog(TQWidget* tqparent, const char* name)
-    : KSpreadKexiImportDialogBase(tqparent,name)
+    KSpreadKexiImportDialog::KSpreadKexiImportDialog(TQWidget* parent, const char* name)
+    : KSpreadKexiImportDialogBase(parent,name)
 {
     connect(this->m_insertButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
     connect(this->m_cancelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.h b/filters/kspread/kexi/kspread_kexiimportdialog.h
index 81948f34d..1476a25e6 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialog.h
+++ b/filters/kspread/kexi/kspread_kexiimportdialog.h
@@ -68,7 +68,7 @@ public:
      * The dates in the dialog initialize to a complete calendar for the
      * current month.
      */
-    KSpreadKexiImportDialog(TQWidget* tqparent = 0, const char* name = 0);
+    KSpreadKexiImportDialog(TQWidget* parent = 0, const char* name = 0);
 
     /**
      * Virtual destructor.
diff --git a/filters/kspread/latex/export/format.h b/filters/kspread/latex/export/format.h
index c0ab61aae..7025c3712 100644
--- a/filters/kspread/latex/export/format.h
+++ b/filters/kspread/latex/export/format.h
@@ -77,7 +77,7 @@ class Format: public XmlParser
 		 *
 		 * Creates a new instance of Format.
 		 *
-		 * @param Para the tqparent class of the format.
+		 * @param Para the parent class of the format.
 		 */
 		Format();
 
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index 479bb547d..a7f03f60a 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -49,15 +49,15 @@
 #endif*/
 
 /*
- *  Constructs a KSpreadLatexExportDiaImpl which is a child of 'tqparent', with the
+ *  Constructs a KSpreadLatexExportDiaImpl which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* tqparent, 
+KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* parent, 
 		const char* name_, bool modal, WFlags fl )
-    : LatexExportDia( tqparent, name_, modal, fl ), _in( in )
+    : LatexExportDia( parent, name_, modal, fl ), _in( in )
 {
 	int i = 0;
 
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h
index 33bb62223..9e3e02d26 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h
@@ -41,7 +41,7 @@ class KSpreadLatexExportDiaImpl : public LatexExportDia
 		LatexExportIface* _iface;
 
 	public:
-    KSpreadLatexExportDiaImpl( KoStore*, TQWidget* tqparent = 0,
+    KSpreadLatexExportDiaImpl( KoStore*, TQWidget* parent = 0,
 				const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     virtual ~KSpreadLatexExportDiaImpl();
 
diff --git a/filters/kspread/latex/export/latexexport.h b/filters/kspread/latex/export/latexexport.h
index 5812d316b..e7c0312be 100644
--- a/filters/kspread/latex/export/latexexport.h
+++ b/filters/kspread/latex/export/latexexport.h
@@ -35,7 +35,7 @@ class LATEXExport : public KoFilter
   TQ_OBJECT
 
 	public:
-		LATEXExport(KoFilter *tqparent, const char *name, const TQStringList&);
+		LATEXExport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~LATEXExport() {}
 
 		virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kspread/latex/export/latexexportIface.cc b/filters/kspread/latex/export/latexexportIface.cc
index 80ca013d0..f99e6745b 100644
--- a/filters/kspread/latex/export/latexexportIface.cc
+++ b/filters/kspread/latex/export/latexexportIface.cc
@@ -22,7 +22,7 @@
 #include "kspreadlatexexportdiaImpl.h"
 
 /*
- *  Constructs a KWordLatexExportDia which is a child of 'tqparent', with the
+ *  Constructs a KWordLatexExportDia which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index 6a0376f49..9e37597cb 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -402,7 +402,7 @@ bool OpenCalcExport::exportContent( KoStore * store, const Doc * ksdoc )
   return true;
 }
 
-void exportNamedExpr( TQDomDocument & doc, TQDomElement & tqparent,
+void exportNamedExpr( TQDomDocument & doc, TQDomElement & parent,
                       AreaList const & namedAreas )
 {
   AreaList::const_iterator it  = namedAreas.begin();
@@ -418,7 +418,7 @@ void exportNamedExpr( TQDomDocument & doc, TQDomElement & tqparent,
     namedRange.setAttribute( "table:base-cell-address", convertRefToBase( ref.sheet_name, ref.rect ) );
     namedRange.setAttribute( "table:cell-range-address", convertRefToRange( ref.sheet_name, ref.rect ) );
 
-    tqparent.appendChild( namedRange );
+    parent.appendChild( namedRange );
 
     ++it;
   }
@@ -1026,14 +1026,14 @@ void OpenCalcExport::exportMasterStyles( TQDomDocument & doc, TQDomElement & mas
 }
 
 void OpenCalcExport::addText( TQString const & text, TQDomDocument & doc,
-                              TQDomElement & tqparent )
+                              TQDomElement & parent )
 {
   if (text.length() > 0 )
-    tqparent.appendChild( doc.createTextNode( text ) );
+    parent.appendChild( doc.createTextNode( text ) );
 }
 
 void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
-                                  TQDomElement & tqparent, const Doc * ksdoc )
+                                  TQDomElement & parent, const Doc * ksdoc )
 {
   TQString text;
   TQString var;
@@ -1052,54 +1052,54 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
         inVar = false;
         if ( var == "<page>" )
         {
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
 
           TQDomElement page = doc.createElement( "text:page-number" );
           page.appendChild( doc.createTextNode( "1" ) );
-          tqparent.appendChild( page );
+          parent.appendChild( page );
         }
         else if ( var == "<pages>" )
         {
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
 
           TQDomElement page = doc.createElement( "text:page-count" );
           page.appendChild( doc.createTextNode( "99" ) );
-          tqparent.appendChild( page );
+          parent.appendChild( page );
         }
         else if ( var == "<date>" )
         {
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
 
           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::tqcurrentDate().toString() ) );
-          tqparent.appendChild( t );
+          parent.appendChild( t );
         }
         else if ( var == "<time>" )
         {
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
 
           TQDomElement t = doc.createElement( "text:time" );
           t.appendChild( doc.createTextNode( TQTime::currentTime().toString() ) );
-          tqparent.appendChild( t );
+          parent.appendChild( t );
         }
         else if ( var == "<file>" ) // filepath + name
         {
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
 
           TQDomElement t = doc.createElement( "text:file-name" );
           t.setAttribute( "text:display", "full" );
           t.appendChild( doc.createTextNode( "???" ) );
-          tqparent.appendChild( t );
+          parent.appendChild( t );
         }
         else if ( var == "<name>" ) // filename
         {
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
 
           TQDomElement t = doc.createElement( "text:title" );
           t.appendChild( doc.createTextNode( "???" ) );
-          tqparent.appendChild( t );
+          parent.appendChild( t );
         }
         else if ( var == "<author>" )
         {
@@ -1108,7 +1108,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
 
           text += authorPage->fullName();
 
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
         }
         else if ( var == "<email>" )
         {
@@ -1117,7 +1117,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
 
           text += authorPage->email();
 
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
         }
         else if ( var == "<org>" )
         {
@@ -1126,21 +1126,21 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
 
           text += authorPage->company();
 
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
         }
         else if ( var == "<sheet>" )
         {
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
 
           TQDomElement s = doc.createElement( "text:sheet-name" );
           s.appendChild( doc.createTextNode( "???" ) );
-          tqparent.appendChild( s );
+          parent.appendChild( s );
         }
         else
         {
           // no known variable:
           text += var;
-          addText( text, doc, tqparent );
+          addText( text, doc, parent );
         }
 
         text = "";
@@ -1156,7 +1156,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
   if ( !text.isEmpty() || !var.isEmpty() )
   {
       //we don't have var at the end =>store it
-      addText( text+var, doc, tqparent );
+      addText( text+var, doc, parent );
   }
 }
 
diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h
index 547481444..97832a9a5 100644
--- a/filters/kspread/opencalc/opencalcexport.h
+++ b/filters/kspread/opencalc/opencalcexport.h
@@ -43,7 +43,7 @@ class OpenCalcExport : public KoFilter
   TQ_OBJECT
 
  public:
-  OpenCalcExport( KoFilter * tqparent, const char * name, const TQStringList & );
+  OpenCalcExport( KoFilter * parent, const char * name, const TQStringList & );
   virtual ~OpenCalcExport() {}
 
   virtual KoFilter::ConversiontqStatus convert( const TQCString & from,
@@ -76,9 +76,9 @@ class OpenCalcExport : public KoFilter
   void maxRowCols( const KSpread::Sheet * sheet,
                    int & maxCols, int & maxRows );
   void convertPart( TQString const & part, TQDomDocument & doc,
-                    TQDomElement & tqparent, const KSpread::Doc * ksdoc );
+                    TQDomElement & parent, const KSpread::Doc * ksdoc );
   void addText( TQString const & text, TQDomDocument & doc,
-                TQDomElement & tqparent );
+                TQDomElement & parent );
 
   void createDefaultStyles();
   TQString convertFormula( TQString const & formula ) const;
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index f52ffd0fa..376a8f776 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -476,8 +476,8 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet  * table, int row,
         cell = table->nonDefaultCell( columns, row );
 
       TQString psName( "Default" );
-      if ( e.hasAttributeNS( ooNS::style, "tqparent-style-name" ) )
-        psName = e.attributeNS( ooNS::style, "tqparent-style-name", TQString() );
+      if ( e.hasAttributeNS( ooNS::style, "parent-style-name" ) )
+        psName = e.attributeNS( ooNS::style, "parent-style-name", TQString() );
 
       kdDebug(30518) << "Default style: " << psName << endl;
       Format * tqlayout = m_defaultStyles[psName];
@@ -2221,11 +2221,11 @@ 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)
   {
-    if ( style.hasAttributeNS( ooNS::style, "tqparent-style-name" ) )
+    if ( style.hasAttributeNS( ooNS::style, "parent-style-name" ) )
     {
       Format * cp
-        = m_defaultStyles.find( style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) );
-      kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) << endl;
+        = m_defaultStyles.find( style.attributeNS( ooNS::style, "parent-style-name", TQString() ) );
+      kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl;
 
       if ( cp != 0 )
         tqlayout->copy( *cp );
diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h
index b7dca822d..cd1f23b63 100644
--- a/filters/kspread/opencalc/opencalcimport.h
+++ b/filters/kspread/opencalc/opencalcimport.h
@@ -44,7 +44,7 @@ class OpenCalcImport : public KoFilter
   Q_OBJECT
   TQ_OBJECT
  public:
-  OpenCalcImport( KoFilter * tqparent, const char * name, const TQStringList & );
+  OpenCalcImport( KoFilter * parent, const char * name, const TQStringList & );
   virtual ~OpenCalcImport();
 
   virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
diff --git a/filters/kspread/opencalc/opencalcstyleexport.cc b/filters/kspread/opencalc/opencalcstyleexport.cc
index 2c81a2cce..f075713a6 100644
--- a/filters/kspread/opencalc/opencalcstyleexport.cc
+++ b/filters/kspread/opencalc/opencalcstyleexport.cc
@@ -200,7 +200,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl
         TQDomElement ts = doc.createElement( "style:style" );
         ts.setAttribute( "style:name", t->name );
         ts.setAttribute( "style:family", "table-cell" );
-        ts.setAttribute( "style:tqparent-style-name", "Default" );
+        ts.setAttribute( "style:parent-style-name", "Default" );
         if ( t->numberStyle.length() > 0 )
             ts.setAttribute( "style:data-style-name", t->numberStyle );
 
diff --git a/filters/kspread/qpro/qproimport.h b/filters/kspread/qpro/qproimport.h
index 031f5cdf8..1c3c7d851 100644
--- a/filters/kspread/qpro/qproimport.h
+++ b/filters/kspread/qpro/qproimport.h
@@ -34,7 +34,7 @@ class QpImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    QpImport(KoFilter* tqparent, const char* name, const TQStringList&);
+    QpImport(KoFilter* parent, const char* name, const TQStringList&);
     virtual ~QpImport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kugar/kugarnop/kugarnopimport.h b/filters/kugar/kugarnop/kugarnopimport.h
index acb77e95c..030854107 100644
--- a/filters/kugar/kugarnop/kugarnopimport.h
+++ b/filters/kugar/kugarnop/kugarnopimport.h
@@ -26,7 +26,7 @@ class KugarNOPImport : public KoFilter
   TQ_OBJECT
 
 public:
-    KugarNOPImport( KoFilter *tqparent, const char *name, const TQStringList& );
+    KugarNOPImport( KoFilter *parent, const char *name, const TQStringList& );
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc
index 96c5cc6d4..717611cda 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cc
@@ -1221,7 +1221,7 @@ bool AbiWordWorker::doFullDocumentInfo(const KWEFDocumentInfo& docInfo)
 
 // ==========================================================================================
 
-ABIWORDExport::ABIWORDExport(KoFilter */*tqparent*/, const char */*name*/, const TQStringList &) :
+ABIWORDExport::ABIWORDExport(KoFilter */*parent*/, const char */*name*/, const TQStringList &) :
                      KoFilter() {
 }
 
diff --git a/filters/kword/abiword/abiwordexport.h b/filters/kword/abiword/abiwordexport.h
index 85203f8b7..550b7682f 100644
--- a/filters/kword/abiword/abiwordexport.h
+++ b/filters/kword/abiword/abiwordexport.h
@@ -44,7 +44,7 @@ class ABIWORDExport : public KoFilter {
   TQ_OBJECT
 
 public:
-    ABIWORDExport(KoFilter *tqparent, const char *name, const TQStringList &);
+    ABIWORDExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~ABIWORDExport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index 56524cd69..4815d02cf 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -223,11 +223,11 @@ bool EndElementC (StackItem* stackItem, StackItem* stackCurrent)
     if (stackItem->elementType==ElementTypeContent)
     {
         stackItem->stackElementText.normalize();
-        stackCurrent->pos=stackItem->pos; //Propagate the position back to the tqparent element
+        stackCurrent->pos=stackItem->pos; //Propagate the position back to the parent element
     }
     else if (stackItem->elementType==ElementTypeAnchorContent)
     {
-        stackCurrent->strTemp2+=stackItem->strTemp2; //Propagate the link name back to the tqparent element
+        stackCurrent->strTemp2+=stackItem->strTemp2; //Propagate the link name back to the parent element
     }
     else
     {
@@ -313,7 +313,7 @@ static bool EndElementA (StackItem* stackItem, StackItem* stackCurrent, TQDomDoc
 
     // Now work on stackCurrent
     stackCurrent->stackElementFormatsPlural.appendChild(formatElement);
-    stackCurrent->pos++; //Propagate the position back to the tqparent element
+    stackCurrent->pos++; //Propagate the position back to the parent element
 
     return true;
 }
@@ -784,7 +784,7 @@ static bool StartElementBR(StackItem* stackItem, StackItem* stackCurrent,
             formatElement.setAttribute("id",1); // Normal text!
             formatElement.setAttribute("pos",stackCurrent->pos); // Start position
             formatElement.setAttribute("len",1);
-            AddFormat(formatElement, stackCurrent, mainDocument); // Add the format of the tqparent <c>
+            AddFormat(formatElement, stackCurrent, mainDocument); // Add the format of the parent <c>
             stackCurrent->stackElementFormatsPlural.appendChild(formatElement); //Append to <FORMATS>
         }
 
@@ -1753,7 +1753,7 @@ bool StructureParser::clearStackUntilParagraph(StackItemStack& auxilaryStack)
     }
 }
 
-ABIWORDImport::ABIWORDImport(KoFilter */*tqparent*/, const char */*name*/, const TQStringList &) :
+ABIWORDImport::ABIWORDImport(KoFilter */*parent*/, const char */*name*/, const TQStringList &) :
                      KoFilter() {
 }
 
diff --git a/filters/kword/abiword/abiwordimport.h b/filters/kword/abiword/abiwordimport.h
index c48ac3621..9ff4d764c 100644
--- a/filters/kword/abiword/abiwordimport.h
+++ b/filters/kword/abiword/abiwordimport.h
@@ -46,7 +46,7 @@ class ABIWORDImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    ABIWORDImport(KoFilter *tqparent, const char *name, const TQStringList &);
+    ABIWORDImport(KoFilter *parent, const char *name, const TQStringList &);
     ABIWORDImport();
     virtual ~ABIWORDImport() {}
 
diff --git a/filters/kword/amipro/amiproexport.h b/filters/kword/amipro/amiproexport.h
index d4a0603e0..c9e1f5d96 100644
--- a/filters/kword/amipro/amiproexport.h
+++ b/filters/kword/amipro/amiproexport.h
@@ -30,7 +30,7 @@ class AmiProExport : public KoFilter
 
   public:
 
-    AmiProExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    AmiProExport(KoFilter *parent, const char *name, const TQStringList&);
     AmiProExport();
 
     virtual ~AmiProExport() {}
diff --git a/filters/kword/amipro/amiproimport.h b/filters/kword/amipro/amiproimport.h
index 8d22270f8..ad0785437 100644
--- a/filters/kword/amipro/amiproimport.h
+++ b/filters/kword/amipro/amiproimport.h
@@ -32,7 +32,7 @@ class AmiProImport : public KoFilter
 
   public:
 
-    AmiProImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    AmiProImport(KoFilter *parent, const char *name, const TQStringList&);
     AmiProImport();
 
     virtual ~AmiProImport() {}
diff --git a/filters/kword/applixword/applixwordimport.h b/filters/kword/applixword/applixwordimport.h
index f82066ec5..ccd80df73 100644
--- a/filters/kword/applixword/applixwordimport.h
+++ b/filters/kword/applixword/applixwordimport.h
@@ -47,7 +47,7 @@ class APPLIXWORDImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    APPLIXWORDImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    APPLIXWORDImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~APPLIXWORDImport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc
index 1d408b18e..138618b2e 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cc
@@ -33,8 +33,8 @@
 #include <ExportDialogUI.h>
 #include <ExportDialog.h>
 
-AsciiExportDialog :: AsciiExportDialog(TQWidget* tqparent)
-    : KDialogBase(tqparent, 0, true, i18n("KWord's Plain Text Export Filter"), Ok|Cancel, No, true),
+AsciiExportDialog :: AsciiExportDialog(TQWidget* parent)
+    : KDialogBase(parent, 0, true, i18n("KWord's Plain Text Export Filter"), Ok|Cancel, No, true),
       m_dialog(new ExportDialogUI(this))
 {
 
@@ -84,7 +84,7 @@ TQTextCodec* AsciiExportDialog::getCodec(void) const
     {
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
-        // ### TODO: what tqparent to use?
+        // ### TODO: what parent to use?
         KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
diff --git a/filters/kword/ascii/ExportDialog.h b/filters/kword/ascii/ExportDialog.h
index 2d75df8e4..eb3f526b0 100644
--- a/filters/kword/ascii/ExportDialog.h
+++ b/filters/kword/ascii/ExportDialog.h
@@ -33,7 +33,7 @@ class AsciiExportDialog : public KDialogBase
   TQ_OBJECT
 public:
 
-    AsciiExportDialog(TQWidget* tqparent=NULL);
+    AsciiExportDialog(TQWidget* parent=NULL);
     ~AsciiExportDialog(void);
     TQString getEndOfLine(void) const;
     TQTextCodec* getCodec(void) const;
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc
index 4bcccc58f..adb345b1e 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cc
@@ -33,8 +33,8 @@
 #include <ImportDialogUI.h>
 #include <ImportDialog.h>
 
-AsciiImportDialog :: AsciiImportDialog(TQWidget* tqparent)
-    : KDialogBase(tqparent, 0, true,  i18n("KWord's Plain Text Import Filter"), Ok|Cancel, No, true),
+AsciiImportDialog :: AsciiImportDialog(TQWidget* parent)
+    : KDialogBase(parent, 0, true,  i18n("KWord's Plain Text Import Filter"), Ok|Cancel, No, true),
       m_dialog(new ImportDialogUI(this))
 {
 
@@ -83,7 +83,7 @@ TQTextCodec* AsciiImportDialog::getCodec(void) const
     {
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
-        // ### TODO: what tqparent to use?
+        // ### TODO: what parent to use?
         KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
diff --git a/filters/kword/ascii/ImportDialog.h b/filters/kword/ascii/ImportDialog.h
index 929aa8fc3..0cb97240f 100644
--- a/filters/kword/ascii/ImportDialog.h
+++ b/filters/kword/ascii/ImportDialog.h
@@ -32,7 +32,7 @@ class AsciiImportDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    AsciiImportDialog(TQWidget* tqparent=NULL);
+    AsciiImportDialog(TQWidget* parent=NULL);
     ~AsciiImportDialog(void);
     TQTextCodec* getCodec(void) const;
     int getParagraphStrategy(void) const;
diff --git a/filters/kword/ascii/asciiexport.h b/filters/kword/ascii/asciiexport.h
index 88db0c8f0..af1e2e04c 100644
--- a/filters/kword/ascii/asciiexport.h
+++ b/filters/kword/ascii/asciiexport.h
@@ -28,7 +28,7 @@ class ASCIIExport : public KoFilter
   TQ_OBJECT
 
 public:
-    ASCIIExport(KoFilter* tqparent, const char* name, const TQStringList&);
+    ASCIIExport(KoFilter* parent, const char* name, const TQStringList&);
     virtual ~ASCIIExport() {}
 
     virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
diff --git a/filters/kword/ascii/asciiimport.h b/filters/kword/ascii/asciiimport.h
index 6d3158799..4d332776b 100644
--- a/filters/kword/ascii/asciiimport.h
+++ b/filters/kword/ascii/asciiimport.h
@@ -61,7 +61,7 @@ class ASCIIImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    ASCIIImport(KoFilter *tqparent, const char *name, const TQStringList &);
+    ASCIIImport(KoFilter *parent, const char *name, const TQStringList &);
     ASCIIImport();
     virtual ~ASCIIImport() {}
 
diff --git a/filters/kword/docbook/docbookexport.h b/filters/kword/docbook/docbookexport.h
index 9a1611c82..cf7ec8041 100644
--- a/filters/kword/docbook/docbookexport.h
+++ b/filters/kword/docbook/docbookexport.h
@@ -35,7 +35,7 @@ class DocBookExport : public KoFilter {
   TQ_OBJECT
 
 public:
-    DocBookExport (KoFilter *tqparent, const char *name, const TQStringList & );
+    DocBookExport (KoFilter *parent, const char *name, const TQStringList & );
     virtual ~DocBookExport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/hancomword/hancomwordimport.h b/filters/kword/hancomword/hancomwordimport.h
index 7cacd668a..64d279a88 100644
--- a/filters/kword/hancomword/hancomwordimport.h
+++ b/filters/kword/hancomword/hancomwordimport.h
@@ -32,7 +32,7 @@ Q_OBJECT
 
 public:
 
-    HancomWordImport ( TQObject *tqparent, const char* name, const TQStringList& );
+    HancomWordImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~HancomWordImport();
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/hancomword/pole.cpp b/filters/kword/hancomword/pole.cpp
index dfcb31f56..f712f0e11 100644
--- a/filters/kword/hancomword/pole.cpp
+++ b/filters/kword/hancomword/pole.cpp
@@ -115,7 +115,7 @@ class DirTree
     DirEntry* entry( unsigned index );
     DirEntry* entry( const std::string& name, bool create=false );
     int indexOf( DirEntry* e );
-    int tqparent( unsigned index );
+    int parent( unsigned index );
     std::string fullName( unsigned index );
     std::vector<unsigned> tqchildren( unsigned index );
     void load( unsigned char* buffer, unsigned len );
@@ -505,7 +505,7 @@ int DirTree::indexOf( DirEntry* e )
   return -1;
 }
 
-int DirTree::tqparent( unsigned index )
+int DirTree::parent( unsigned index )
 {
   // brute-force, basically we iterate for each entries, find its tqchildren
   // and check if one of the tqchildren is 'index'
@@ -527,7 +527,7 @@ std::string DirTree::fullName( unsigned index )
 
   std::string result = entry( index )->name;
   result.insert( 0,  "/" );
-  int p = tqparent( index );
+  int p = parent( index );
   DirEntry * _entry = 0;
   while( p > 0 )
   {
@@ -595,7 +595,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
        if( !create ) return (DirEntry*)0;
        
        // create a new entry
-       unsigned tqparent = index;
+       unsigned parent = index;
        entries.push_back( DirEntry() );
        index = entryCount()-1;
        DirEntry* e = entry( index );
@@ -606,8 +606,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
        e->start = 0;
        e->child = End;
        e->prev = End;
-       e->next = entry(tqparent)->child;
-       entry(tqparent)->child = index;
+       e->next = entry(parent)->child;
+       entry(parent)->child = index;
      }
    }
 
@@ -1102,7 +1102,7 @@ StreamIO::StreamIO( StorageIO* s, DirEntry* e)
   updateCache();
 }
 
-// FIXME tell tqparent we're gone
+// FIXME tell parent we're gone
 StreamIO::~StreamIO()
 {
   delete[] cache_data;  
@@ -1248,8 +1248,8 @@ std::list<std::string> Storage::entries( const std::string& path )
   DirEntry* e = dt->entry( path, false );
   if( e  && e->dir )
   {
-    unsigned tqparent = dt->indexOf( e );
-    std::vector<unsigned> tqchildren = dt->tqchildren( tqparent );
+    unsigned parent = dt->indexOf( e );
+    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
     for( unsigned i = 0; i < tqchildren.size(); i++ )
       result.push_back( dt->entry( tqchildren[i] )->name );
   }
@@ -1270,7 +1270,7 @@ Stream::Stream( Storage* storage, const std::string& name )
   io = storage->io->streamIO( name );
 }
 
-// FIXME tell tqparent we're gone
+// FIXME tell parent we're gone
 Stream::~Stream()
 {
   delete io;
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc
index 3f1d0b3e6..20c7069bf 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cc
@@ -37,8 +37,8 @@
 #include <ExportDialogUI.h>
 #include <ExportDialog.h>
 
-HtmlExportDialog :: HtmlExportDialog(TQWidget* tqparent)
-    : KDialogBase(tqparent, 0, true, i18n("KWord's HTML Export Filter"), Ok|Cancel, No, true),
+HtmlExportDialog :: HtmlExportDialog(TQWidget* parent)
+    : KDialogBase(parent, 0, true, i18n("KWord's HTML Export Filter"), Ok|Cancel, No, true),
       m_dialog(new ExportDialogUI(this))
 {
 
@@ -105,7 +105,7 @@ TQTextCodec* HtmlExportDialog::getCodec(void) const
     {
         // Default: UTF-8
         kdWarning(30503) << "Cannot find encoding:" << strCodec << endl;
-        // ### TODO: what tqparent to use?
+        // ### TODO: what parent to use?
         KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
diff --git a/filters/kword/html/export/ExportDialog.h b/filters/kword/html/export/ExportDialog.h
index 978f6e6b2..0feb30453 100644
--- a/filters/kword/html/export/ExportDialog.h
+++ b/filters/kword/html/export/ExportDialog.h
@@ -39,7 +39,7 @@ public:
       CustomCSS
     };
 
-    HtmlExportDialog(TQWidget* tqparent=NULL);
+    HtmlExportDialog(TQWidget* parent=NULL);
     ~HtmlExportDialog(void);
     bool isXHtml(void) const;
     TQTextCodec* getCodec(void) const;
diff --git a/filters/kword/html/export/htmlexport.h b/filters/kword/html/export/htmlexport.h
index c4e732924..5de5ef6a9 100644
--- a/filters/kword/html/export/htmlexport.h
+++ b/filters/kword/html/export/htmlexport.h
@@ -36,7 +36,7 @@ class HTMLExport : public KoFilter {
   TQ_OBJECT
 
 public:
-    HTMLExport(KoFilter *tqparent, const char *name, const TQStringList &);
+    HTMLExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~HTMLExport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/html/import/htmlimport.h b/filters/kword/html/import/htmlimport.h
index b383665b8..f7c61a413 100644
--- a/filters/kword/html/import/htmlimport.h
+++ b/filters/kword/html/import/htmlimport.h
@@ -34,7 +34,7 @@ class HTMLImport : public KoFilter {
   TQ_OBJECT
 
 public:
-    HTMLImport(KoFilter *tqparent, const char *name, const TQStringList &);
+    HTMLImport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~HTMLImport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp
index 23211ecc2..56568be9d 100644
--- a/filters/kword/html/import/kwdwriter.cpp
+++ b/filters/kword/html/import/kwdwriter.cpp
@@ -170,9 +170,9 @@ TQDomElement KWDWriter::currentLayout(TQDomElement paragraph) {
 
 TQDomElement KWDWriter::createTableCell(int tableno, int nrow,
 				int ncol, int colspan, TQRect rect) {
-	TQDomElement tqparent=docroot().elementsByTagName("FRAMESETS").item(0).toElement();
+	TQDomElement parent=docroot().elementsByTagName("FRAMESETS").item(0).toElement();
 
-	TQDomElement fs=addFrameSet(tqparent,1,0,
+	TQDomElement fs=addFrameSet(parent,1,0,
 			TQString("Table %1 - %2,%3").tqarg(tableno).tqarg(nrow).tqarg(ncol),
 			1);
 	fs.setAttribute("grpMgr",TQString("Table %1").tqarg(tableno));
@@ -278,11 +278,11 @@ void KWDWriter::finishTable(int tableno,TQRect rect) {
 }
 
 
-TQDomElement KWDWriter::addFrameSet(TQDomElement tqparent, int frametype,
+TQDomElement KWDWriter::addFrameSet(TQDomElement parent, int frametype,
 				   int frameinfo, TQString name, int visible) {
 
 	TQDomElement frameset=_doc->createElement("FRAMESET");
-	tqparent.appendChild(frameset);
+	parent.appendChild(frameset);
 	frameset.setAttribute("frameType",frametype);
 	frameset.setAttribute("frameInfo",frameinfo);
 
@@ -295,9 +295,9 @@ TQDomElement KWDWriter::addFrameSet(TQDomElement tqparent, int frametype,
 	return frameset;
 }
 
-TQDomElement KWDWriter::addParagraph(TQDomElement tqparent) {
+TQDomElement KWDWriter::addParagraph(TQDomElement parent) {
 	TQDomElement k;
-	return addParagraph(tqparent,k);
+	return addParagraph(parent,k);
 }
 
 void KWDWriter::appendKWordVariable(TQDomDocument& doc, TQDomElement& format, 
@@ -353,7 +353,7 @@ TQRect getRect(TQDomElement frameset) {
 }
 
 
-TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement layoutToClone) {
+TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToClone) {
 
 	TQDomElement paragraph=_doc->createElement("PARAGRAPH");
 	TQDomElement formats=_doc->createElement("FORMATS");
@@ -369,7 +369,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement layoutT
 	text.appendChild(t);
 	paragraph.appendChild(formats);
 	paragraph.appendChild(text);
-	tqparent.appendChild(paragraph);
+	parent.appendChild(paragraph);
 	paragraph.appendChild(tqlayout);
 	layoutAttribute(paragraph,"NAME","value","Standard");
 	return paragraph;
diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h
index 59694e8d3..542a1748f 100644
--- a/filters/kword/html/import/kwdwriter.h
+++ b/filters/kword/html/import/kwdwriter.h
@@ -44,9 +44,9 @@ public:
 
 
 	/**
-	 * adds a frameset to tqparent FIXME
+	 * adds a frameset to parent FIXME
 	 **/
-	TQDomElement addFrameSet(TQDomElement tqparent, int frametype=1,
+	TQDomElement addFrameSet(TQDomElement parent, int frametype=1,
 				   int frameinfo=0, TQString name=TQString(),
 				   int visible=1);
 
@@ -114,8 +114,8 @@ public:
 	/**
 	 * adds a paragraph
 	 **/
-	TQDomElement addParagraph(TQDomElement tqparent);
-	TQDomElement addParagraph(TQDomElement tqparent, TQDomElement tqlayout);
+	TQDomElement addParagraph(TQDomElement parent);
+	TQDomElement addParagraph(TQDomElement parent, TQDomElement tqlayout);
 
 	/**
 	 * adds/changes an attribute to/of the current format
diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp
index 58349af8d..ebcf3f6a7 100644
--- a/filters/kword/kword1.3/import/kword13import.cpp
+++ b/filters/kword/kword1.3/import/kword13import.cpp
@@ -38,7 +38,7 @@ typedef KGenericFactory<KWord13Import, KoFilter> KWord13ImportFactory;
 K_EXPORT_COMPONENT_FACTORY( libkwordkword1dot3import, KWord13ImportFactory( "kofficefilters" ) )
 
 
-KWord13Import::KWord13Import(KoFilter */*tqparent*/, const char */*name*/, const TQStringList &)
+KWord13Import::KWord13Import(KoFilter */*parent*/, const char */*name*/, const TQStringList &)
      : KoFilter()
 {
 }
diff --git a/filters/kword/kword1.3/import/kword13import.h b/filters/kword/kword1.3/import/kword13import.h
index d5bebeb33..7d60dd892 100644
--- a/filters/kword/kword1.3/import/kword13import.h
+++ b/filters/kword/kword1.3/import/kword13import.h
@@ -36,7 +36,7 @@ class KWord13Import : public KoFilter {
   TQ_OBJECT
 
 public:
-    KWord13Import(KoFilter *tqparent, const char *name, const TQStringList &);
+    KWord13Import(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~KWord13Import() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp
index 2f6403af4..e3958b45a 100644
--- a/filters/kword/kword1.3/import/kword13parser.cpp
+++ b/filters/kword/kword1.3/import/kword13parser.cpp
@@ -158,7 +158,7 @@ bool KWord13Parser::startElementName( const TQString&, const TQXmlAttributes& at
 
 bool KWord13Parser::startElementFormat( const TQString&, const TQXmlAttributes& attributes, KWord13StackItem *stackItem )
 {
-    // ### TODO: check tqparent?
+    // ### TODO: check parent?
     if ( stackItem->elementType == KWord13TypeIgnore )
     {
         return true;
@@ -230,7 +230,7 @@ bool KWord13Parser::startElementFormat( const TQString&, const TQXmlAttributes&
 
 bool KWord13Parser::startElementLayout( const TQString&, const TQXmlAttributes& attributes, KWord13StackItem *stackItem )
 {
-    // ### TODO: check tqparent?
+    // ### TODO: check parent?
     if ( stackItem->elementType == KWord13TypeIgnore )
     {
         return true;
@@ -408,7 +408,7 @@ bool KWord13Parser::startElementDocumentAttributes( const TQString& name, const
     }
     else
     {
-        kdError(30520) << "Wrong tqparent!" << endl;
+        kdError(30520) << "Wrong parent!" << endl;
         return false;
     }
 }
diff --git a/filters/kword/latex/export/anchor.h b/filters/kword/latex/export/anchor.h
index 4e6666699..3249857ca 100644
--- a/filters/kword/latex/export/anchor.h
+++ b/filters/kword/latex/export/anchor.h
@@ -50,7 +50,7 @@ class Anchor: public Format
 		/**
 		 * Creates a new instances of Anchor.
 		 *
-		 * @param para the tqparent class.
+		 * @param para the parent class.
 		 */
 		Anchor(Para* para = 0);
 		//Anchor(TextZone);
diff --git a/filters/kword/latex/export/footnote.h b/filters/kword/latex/export/footnote.h
index 468de523e..ba65e9324 100644
--- a/filters/kword/latex/export/footnote.h
+++ b/filters/kword/latex/export/footnote.h
@@ -49,7 +49,7 @@ class Footnote: public Format
 		 *
 		 * Creates a new instances of Footnote.
 		 *
-		 * @param Para is the tqparent class
+		 * @param Para is the parent class
 		 */
 		Footnote(Para* para = 0);
 		//Footnote(TextZone);
diff --git a/filters/kword/latex/export/format.h b/filters/kword/latex/export/format.h
index c75517674..c4c3e37ac 100644
--- a/filters/kword/latex/export/format.h
+++ b/filters/kword/latex/export/format.h
@@ -68,7 +68,7 @@ class Format: public XmlParser
 		 *
 		 * Creates a new instance of Format.
 		 *
-		 * @param Para the tqparent class of the format.
+		 * @param Para the parent class of the format.
 		 */
 		Format(Para *para= 0): _id((EFormat) 0), _para(para)
 		{}
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index b59042487..079b38d3a 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cc
@@ -50,15 +50,15 @@
 #endif*/
 
 /*
- *  Constructs a KWordLatexExportDia which is a child of 'tqparent', with the
+ *  Constructs a KWordLatexExportDia which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* tqparent, 
+KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent, 
 		const char* name_, bool modal, WFlags fl )
-    : LatexExportDia( tqparent, name_, modal, fl ),_in( in )
+    : LatexExportDia( parent, name_, modal, fl ),_in( in )
 {
 	int i = 0;
 
diff --git a/filters/kword/latex/export/kwordlatexexportdia.h b/filters/kword/latex/export/kwordlatexexportdia.h
index 8aca29eda..af3d4cd58 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.h
+++ b/filters/kword/latex/export/kwordlatexexportdia.h
@@ -40,7 +40,7 @@ class KWordLatexExportDia : public LatexExportDia
 		LatexExportIface* _iface;
 
 	public:
-    KWordLatexExportDia( KoStore*, TQWidget* tqparent = 0,
+    KWordLatexExportDia( KoStore*, TQWidget* parent = 0,
 				const char* name = 0, bool modal = true, WFlags fl = 0 );
     virtual ~KWordLatexExportDia();
 
diff --git a/filters/kword/latex/export/latexexport.h b/filters/kword/latex/export/latexexport.h
index 5812d316b..e7c0312be 100644
--- a/filters/kword/latex/export/latexexport.h
+++ b/filters/kword/latex/export/latexexport.h
@@ -35,7 +35,7 @@ class LATEXExport : public KoFilter
   TQ_OBJECT
 
 	public:
-		LATEXExport(KoFilter *tqparent, const char *name, const TQStringList&);
+		LATEXExport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~LATEXExport() {}
 
 		virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/latex/export/latexexportIface.cc b/filters/kword/latex/export/latexexportIface.cc
index a50d7c610..102845b10 100644
--- a/filters/kword/latex/export/latexexportIface.cc
+++ b/filters/kword/latex/export/latexexportIface.cc
@@ -22,7 +22,7 @@
 #include "kwordlatexexportdia.h"
 
 /*
- *  Constructs a KWordLatexExportDia which is a child of 'tqparent', with the
+ *  Constructs a KWordLatexExportDia which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
diff --git a/filters/kword/latex/export/listtable.cc b/filters/kword/latex/export/listtable.cc
index e5d29725f..55cbf2382 100644
--- a/filters/kword/latex/export/listtable.cc
+++ b/filters/kword/latex/export/listtable.cc
@@ -35,7 +35,7 @@ ListTable::ListTable()
 /*******************************************/
 ListTable::~ListTable()
 {
-	/* Just call the tqparent destructor */
+	/* Just call the parent destructor */
 }
 
 /*******************************************/
diff --git a/filters/kword/latex/export/textzone.h b/filters/kword/latex/export/textzone.h
index a9f5ff077..fbc09280b 100644
--- a/filters/kword/latex/export/textzone.h
+++ b/filters/kword/latex/export/textzone.h
@@ -48,7 +48,7 @@ class TextZone: public TextFormat
 		/**
 		 *  Creates a new instance of TextZone.
 		 *
-		 * @param para which is the tqparent class.
+		 * @param para which is the parent class.
 		 */
 		TextZone(Para *para = 0);
 		/**
@@ -56,7 +56,7 @@ class TextZone: public TextFormat
 		 * Creates a new instance of TextZOne.
 		 *
 		 * @param text the text in this zone.
-		 * @param para which is the tqparent class.
+		 * @param para which is the parent class.
 		 */
 		TextZone(TQString text, Para *para = 0);
 
diff --git a/filters/kword/latex/export/variablezone.h b/filters/kword/latex/export/variablezone.h
index bb3c2ba98..a428984a1 100644
--- a/filters/kword/latex/export/variablezone.h
+++ b/filters/kword/latex/export/variablezone.h
@@ -46,7 +46,7 @@ class VariableZone: public VariableFormat
 		/**
 		 *  Creates a new instance of VariableZone.
 		 *
-		 * @param Para which is the tqparent class.
+		 * @param Para which is the parent class.
 		 */
 		VariableZone(Para* para);
 		
@@ -54,7 +54,7 @@ class VariableZone: public VariableFormat
 		 * Creates a new instance of TextZOne.
 		 *
 		 * @param text the text in this zone.
-		 * @param para which is the tqparent class.
+		 * @param para which is the parent class.
 		 */
 		VariableZone(TQString text, Para* para);
 
diff --git a/filters/kword/latex/import/lateximport.h b/filters/kword/latex/import/lateximport.h
index a3cba4d04..949d7163b 100644
--- a/filters/kword/latex/import/lateximport.h
+++ b/filters/kword/latex/import/lateximport.h
@@ -35,7 +35,7 @@ class LATEXImport : public KoFilter
   TQ_OBJECT
 
 	public:
-		LATEXImport(KoFilter *tqparent, const char *name, const TQStringList&);
+		LATEXImport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~LATEXImport() {}
 
 		virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc
index c6c28a77e..9489d4919 100644
--- a/filters/kword/latex/import/lateximportdia.cc
+++ b/filters/kword/latex/import/lateximportdia.cc
@@ -44,8 +44,8 @@
 
 #include "generator/kwordgenerator.h"
 
-LATEXImportDia::LATEXImportDia(KoStore* out, TQWidget *tqparent, const char *name) :
-						KDialogBase(tqparent, name, true, i18n("Latex Import Filter Parameters"),
+LATEXImportDia::LATEXImportDia(KoStore* out, TQWidget *parent, const char *name) :
+						KDialogBase(parent, name, true, i18n("Latex Import Filter Parameters"),
 									Ok|Cancel),
 						DCOPObject("FilterConfigDia"), _out(out)
 {
diff --git a/filters/kword/latex/import/lateximportdia.h b/filters/kword/latex/import/lateximportdia.h
index 4f4c8c391..b6f83baaf 100644
--- a/filters/kword/latex/import/lateximportdia.h
+++ b/filters/kword/latex/import/lateximportdia.h
@@ -60,7 +60,7 @@ class LATEXImportDia : public KDialogBase, public DCOPObject
 	KoStore* _out;	/* the zipped file containing all pictures, part, ... */
 
 	public:
-		LATEXImportDia(KoStore*, TQWidget *tqparent=0L, const char *name=0L);
+		LATEXImportDia(KoStore*, TQWidget *parent=0L, const char *name=0L);
 
 		virtual ~LATEXImportDia() {}
 		void createDialog();
diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp
index 83dae4ab8..6bd895b97 100644
--- a/filters/kword/msword/conversion.cpp
+++ b/filters/kword/msword/conversion.cpp
@@ -403,21 +403,21 @@ bool Conversion::isHeader( unsigned char type )
     return false;
 }
 
-int Conversion::headerMaskToHType( unsigned char tqmask )
+int Conversion::headerMaskToHType( unsigned char mask )
 {
-    bool hasFirst = ( tqmask & wvWare::HeaderData::HeaderFirst );
+    bool hasFirst = ( mask & wvWare::HeaderData::HeaderFirst );
     // Odd is always there. We have even!=odd only if Even is there too.
-    bool hasEvenOdd = ( tqmask & wvWare::HeaderData::HeaderEven );
+    bool hasEvenOdd = ( mask & wvWare::HeaderData::HeaderEven );
     //kdDebug(30513) << k_funcinfo << " hasEvenOdd=" << hasEvenOdd << endl;
     if ( hasFirst )
         return hasEvenOdd ? 1 : 2;
     return hasEvenOdd ? 3 : 0;
 }
 
-int Conversion::headerMaskToFType( unsigned char tqmask )
+int Conversion::headerMaskToFType( unsigned char mask )
 {
-    bool hasFirst = ( tqmask & wvWare::HeaderData::FooterFirst );
-    bool hasEvenOdd = ( tqmask & wvWare::HeaderData::FooterEven );
+    bool hasFirst = ( mask & wvWare::HeaderData::FooterFirst );
+    bool hasEvenOdd = ( mask & wvWare::HeaderData::FooterEven );
     // Odd is always there. We have even!=odd only if Even is there too.
     kdDebug(30513) << k_funcinfo << " hasEvenOdd=" << hasEvenOdd << endl;
     if ( hasFirst )
diff --git a/filters/kword/msword/conversion.h b/filters/kword/msword/conversion.h
index 8a9781ce9..fd30c69fe 100644
--- a/filters/kword/msword/conversion.h
+++ b/filters/kword/msword/conversion.h
@@ -82,11 +82,11 @@ namespace Conversion
     // Convert wv2's Header Type to a KWord frameset name
     TQString headerTypeToFramesetName( unsigned char type );
 
-    // Convert a tqmask of Header Types to the hType value for KWord
-    int headerMaskToHType( unsigned char tqmask );
+    // Convert a mask of Header Types to the hType value for KWord
+    int headerMaskToHType( unsigned char mask );
 
-    // Convert a tqmask of Header Types to the fType value for KWord
-    int headerMaskToFType( unsigned char tqmask );
+    // Convert a mask of Header Types to the fType value for KWord
+    int headerMaskToFType( unsigned char mask );
 
     // Convert wv2's FLD to KWord FIELD.subtype (or -1 if can't be handled)
     int fldToFieldType( const wvWare::FLD* fld );
diff --git a/filters/kword/msword/document.h b/filters/kword/msword/document.h
index af527e2a3..4ee628974 100644
--- a/filters/kword/msword/document.h
+++ b/filters/kword/msword/document.h
@@ -128,7 +128,7 @@ private:
     std::queue<SubDocument> m_subdocQueue;
     std::queue<KWord::Table> m_tableQueue;
     TQStringList m_pictureList; // for <PICTURES>
-    unsigned char m_headerFooters; // a tqmask of HeaderData::Type bits
+    unsigned char m_headerFooters; // a mask of HeaderData::Type bits
     bool m_bodyFound;
     int m_footNoteNumber; // number of footnote _framesets_ written out
     int m_endNoteNumber; // number of endnote _framesets_ written out
diff --git a/filters/kword/msword/mswordimport.h b/filters/kword/msword/mswordimport.h
index a961e071b..73a568ffd 100644
--- a/filters/kword/msword/mswordimport.h
+++ b/filters/kword/msword/mswordimport.h
@@ -30,7 +30,7 @@ class MSWordImport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    MSWordImport( KoFilter* tqparent, const char* name, const TQStringList& );
+    MSWordImport( KoFilter* parent, const char* name, const TQStringList& );
     virtual ~MSWordImport();
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 1fea66259..07eb3da72 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -764,7 +764,7 @@ void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare::
                 } else {
                     Q_ASSERT( ch < pap.ilvl ); // Can't see how level 1 would have a <0> in it...
                     if ( ch < pap.ilvl )
-                        ++displayLevels; // we found a 'tqparent level', to be displayed
+                        ++displayLevels; // we found a 'parent level', to be displayed
                     prefix = TQString(); // get rid of previous prefixes
                 }
             } else { // Normal character
@@ -779,10 +779,10 @@ void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare::
             // This is a hierarchical list numbering e.g. <0>.<1>.
             // (unless this is about a heading, in which case we've set numberingtype to 1 already
             // so it will indeed look like that).
-            // The question is whether the '.' is the suffix of the tqparent level already..
+            // The question is whether the '.' is the suffix of the parent level already..
             if ( depth > 0 && !prefix.isEmpty() && m_listSuffixes[ depth - 1 ] == prefix )  {
-                prefix = TQString(); // it's already the tqparent's suffix -> remove it
-                kdDebug(30513) << "depth=" << depth << " tqparent suffix is " << prefix << " -> clearing" << endl;
+                prefix = TQString(); // it's already the parent's suffix -> remove it
+                kdDebug(30513) << "depth=" << depth << " parent suffix is " << prefix << " -> clearing" << endl;
             }
         }
         if ( isHeading )
diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc
index de8fece17..460677cbc 100644
--- a/filters/kword/mswrite/ImportDialog.cc
+++ b/filters/kword/mswrite/ImportDialog.cc
@@ -35,8 +35,8 @@
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 
-MSWriteImportDialog :: MSWriteImportDialog(TQWidget* tqparent)
-    : KDialogBase(tqparent, 0, true,  i18n("KWord's MS Write Import Filter"), Ok|Cancel, No, true),
+MSWriteImportDialog :: MSWriteImportDialog(TQWidget* parent)
+    : KDialogBase(parent, 0, true,  i18n("KWord's MS Write Import Filter"), Ok|Cancel, No, true),
       m_dialog(new ImportDialogUI(this))
 {
     kapp->restoreOverrideCursor();
diff --git a/filters/kword/mswrite/ImportDialog.h b/filters/kword/mswrite/ImportDialog.h
index 29cd2e6f5..2b530ed17 100644
--- a/filters/kword/mswrite/ImportDialog.h
+++ b/filters/kword/mswrite/ImportDialog.h
@@ -31,7 +31,7 @@ class MSWriteImportDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    MSWriteImportDialog(TQWidget* tqparent=NULL);
+    MSWriteImportDialog(TQWidget* parent=NULL);
     ~MSWriteImportDialog(void);
 
     TQTextCodec* getCodec(void) const;
diff --git a/filters/kword/mswrite/mswriteexport.h b/filters/kword/mswrite/mswriteexport.h
index e2ab8fb44..796ce705f 100644
--- a/filters/kword/mswrite/mswriteexport.h
+++ b/filters/kword/mswrite/mswriteexport.h
@@ -28,7 +28,7 @@ class MSWriteExport : public KoFilter
   TQ_OBJECT
 
 public:
-	MSWriteExport (KoFilter *tqparent, const char *name, const TQStringList &);
+	MSWriteExport (KoFilter *parent, const char *name, const TQStringList &);
 	virtual ~MSWriteExport ();
 
 	KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to);
diff --git a/filters/kword/mswrite/mswriteimport.h b/filters/kword/mswrite/mswriteimport.h
index 81f9511ce..65be7e7aa 100644
--- a/filters/kword/mswrite/mswriteimport.h
+++ b/filters/kword/mswrite/mswriteimport.h
@@ -37,7 +37,7 @@ private:
 	KWordGenerator *m_generator;
 
 public:
-	MSWriteImport (KoFilter *tqparent, const char *name, const TQStringList &);
+	MSWriteImport (KoFilter *parent, const char *name, const TQStringList &);
 	virtual ~MSWriteImport ();
 
 	KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to);
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc
index 40f0bee62..ff9c82765 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -1281,7 +1281,7 @@ bool OOWriterWorker::makeTable( const FrameAnchor& anchor, const AnchorType anch
     m_contentAutomaticStyles += "  <style:style"; // for frame
     m_contentAutomaticStyles += " style:name=\"" + escapeOOText( automaticFrameStyle ) + "\"";
     m_contentAutomaticStyles += " style:family=\"graphics\"";
-    m_contentAutomaticStyles += " style:tqparent-style-name=\"Frame\""; // ### TODO: tqparent style needs to be correctly defined
+    m_contentAutomaticStyles += " style:parent-style-name=\"Frame\""; // ### TODO: parent style needs to be correctly defined
     m_contentAutomaticStyles += ">\n";
     m_contentAutomaticStyles += "   <style:properties "; // ### TODO
     m_contentAutomaticStyles += " text:anchor-type=\"as-char\""; // ### TODO: needed?
@@ -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:tqparent-style-name=\"" + escapeOOText(tqlayout.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 ";
diff --git a/filters/kword/oowriter/oowriterexport.cc b/filters/kword/oowriter/oowriterexport.cc
index 156471649..426105e81 100644
--- a/filters/kword/oowriter/oowriterexport.cc
+++ b/filters/kword/oowriter/oowriterexport.cc
@@ -48,7 +48,7 @@ public:
 
 K_EXPORT_COMPONENT_FACTORY( liboowriterexport, OOWRITERExportFactory() )
 
-OOWRITERExport::OOWRITERExport(KoFilter */*tqparent*/, const char */*name*/, const TQStringList &) :
+OOWRITERExport::OOWRITERExport(KoFilter */*parent*/, const char */*name*/, const TQStringList &) :
                      KoFilter() {
 }
 
diff --git a/filters/kword/oowriter/oowriterexport.h b/filters/kword/oowriter/oowriterexport.h
index 3a4e77ff9..8f4695b82 100644
--- a/filters/kword/oowriter/oowriterexport.h
+++ b/filters/kword/oowriter/oowriterexport.h
@@ -44,7 +44,7 @@ class OOWRITERExport : public KoFilter {
   TQ_OBJECT
 
 public:
-    OOWRITERExport(KoFilter *tqparent, const char *name, const TQStringList &);
+    OOWRITERExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~OOWRITERExport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index e1aeda783..eb3b5b852 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -207,7 +207,7 @@ void OoWriterImport::createStyles( TQDomDocument& doc )
         if ( e.attributeNS( ooNS::style, "family", TQString() ) != "paragraph" )
              continue;
 
-        // We use the style stack, to flatten out tqparent styles
+        // We use the style stack, to flatten out parent styles
         // Once KWord supports style inheritance, replace this with a single m_styleStack.push.
         // (We still need to use StyleStack, since that's what writeLayout/writeFormat read from)
         addStyles( &e );
@@ -266,13 +266,13 @@ void OoWriterImport::createStyles( TQDomDocument& doc )
     }
 }
 
-void OoWriterImport::parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement )
+void OoWriterImport::parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement )
 {
     TQDomElement oldCurrentFrameset = m_currentFrameset;
     m_currentFrameset = currentFramesetElement;
     Q_ASSERT( !m_currentFrameset.isNull() );
     TQDomElement t;
-    forEachElement( t, tqparent )
+    forEachElement( t, parent )
     {
         m_styleStack.save();
         const TQString localName = t.localName();
@@ -706,11 +706,11 @@ void OoWriterImport::insertStyles( const TQDomElement& styles, TQDomDocument& do
 // OO spec 2.5.4. p68. Conversion to TQt format: see qdate.html
 // OpenCalcImport::loadFormat has similar code, but slower, intermixed with other stuff,
 // lacking long-textual forms.
-void OoWriterImport::importDateTimeStyle( const TQDomElement& tqparent )
+void OoWriterImport::importDateTimeStyle( const TQDomElement& parent )
 {
     TQString format;
     TQDomElement e;
-    forEachElement( e, tqparent )
+    forEachElement( e, parent )
     {
         const TQString ns = e.namespaceURI();
         if ( ns != ooNS::number )
@@ -754,7 +754,7 @@ void OoWriterImport::importDateTimeStyle( const TQDomElement& tqparent )
 
     TQString kdeFormat;
     TQDomElement e;
-    forEachElement( e, tqparent )
+    forEachElement( e, parent )
     {
         const TQString ns = e.namespaceURI();
         if ( ns != ooNS::number )
@@ -791,7 +791,7 @@ void OoWriterImport::importDateTimeStyle( const TQDomElement& tqparent )
     }
 #endif
 
-    TQString styleName = tqparent.attributeNS( ooNS::style, "name", TQString() );
+    TQString styleName = parent.attributeNS( ooNS::style, "name", TQString() );
     kdDebug(30518) << "datetime style: " << styleName << " qt format=" << format << endl;
     m_dateTimeFormats.insert( styleName, format );
 }
@@ -814,9 +814,9 @@ void OoWriterImport::addStyles( const TQDomElement* style )
 {
     Q_ASSERT( style );
     if ( !style ) return;
-    // this recursive function is necessary as tqparent styles can have parents themselves
-    if ( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) {
-        const TQString parentStyleName = style->attributeNS( ooNS::style, "tqparent-style-name", TQString() );
+    // this recursive function is necessary as parent styles can have parents themselves
+    if ( style->hasAttributeNS( ooNS::style, "parent-style-name" ) ) {
+        const TQString parentStyleName = style->attributeNS( ooNS::style, "parent-style-name", TQString() );
         TQDomElement* parentStyle = m_styles[ parentStyleName ];
         if ( parentStyle )
             addStyles( parentStyle );
@@ -1002,12 +1002,12 @@ static int numberOfParagraphs( const TQDomElement& frameset )
     return paragCount;
 }
 
-void OoWriterImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& tqparent,
+void OoWriterImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& parent,
     TQDomElement& outputParagraph, TQDomElement& outputFormats, TQString& paragraphText, uint& pos)
 {
-    // Parse every child node of the tqparent
+    // Parse every child node of the parent
     // Can't use forEachElement here since we also care about text nodes
-    for( TQDomNode node ( tqparent.firstChild() ); !node.isNull(); node = node.nextSibling() )
+    for( TQDomNode node ( parent.firstChild() ); !node.isNull(); node = node.nextSibling() )
     {
         TQDomElement ts ( node.toElement() );
         TQString textData;
@@ -1850,7 +1850,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o
     {
         KURL url;
         url.setPath(href); // ### TODO: is this really right?
-        picture.setKeyAndDownloadPicture(url, 0); // ### TODO: find a better tqparent if possible
+        picture.setKeyAndDownloadPicture(url, 0); // ### TODO: find a better parent if possible
     }
 
     kdDebug(30518) << "Picture ready! Key: " << picture.getKey().toString() << " Size:" << picture.getOriginalSize() << endl;
@@ -2188,9 +2188,9 @@ void OoWriterImport::appendKWordVariable(TQDomDocument& doc, TQDomElement& forma
     formats.appendChild(formatElement);
 }
 
-void OoWriterImport::parseTable( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement )
+void OoWriterImport::parseTable( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement )
 {
-    TQString tableName ( tqparent.attributeNS( ooNS::table, "name", TQString()) ); // TODO: what if empty (non-unique?)
+    TQString tableName ( parent.attributeNS( ooNS::table, "name", TQString()) ); // TODO: what if empty (non-unique?)
     kdDebug(30518) << "Found table " << tableName << endl;
 
     // In OOWriter a table is never inside a paragraph, in KWord it is always in a paragraph
@@ -2225,7 +2225,7 @@ void OoWriterImport::parseTable( TQDomDocument &doc, const TQDomElement& tqparen
     uint col=0;
     columnLefts[0]=0.0; // Initialize left of first cell
     TQDomElement elem;
-    forEachElement( elem, tqparent )
+    forEachElement( elem, parent )
     {
         if ( elem.localName() == "table-column" && elem.namespaceURI() == ooNS::table )
         {
@@ -2275,10 +2275,10 @@ void OoWriterImport::parseTable( TQDomDocument &doc, const TQDomElement& tqparen
 
     uint row=0;
     uint column=0;
-    parseInsideOfTable(doc, tqparent, currentFramesetElement, tableName, columnLefts, row, column);
+    parseInsideOfTable(doc, parent, currentFramesetElement, tableName, columnLefts, row, column);
 }
 
-void OoWriterImport::parseInsideOfTable( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement,
+void OoWriterImport::parseInsideOfTable( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement,
     const TQString& tableName, const TQMemArray<double> & columnLefts, uint& row, uint& column )
 {
     kdDebug(30518) << "parseInsideOfTable: columnLefts.size()=" << columnLefts.size() << endl;
@@ -2290,7 +2290,7 @@ void OoWriterImport::parseInsideOfTable( TQDomDocument &doc, const TQDomElement&
     }
 
     TQDomElement e;
-    forEachElement( e, tqparent )
+    forEachElement( e, parent )
     {
         m_styleStack.save();
         const TQString localName = e.localName();
diff --git a/filters/kword/oowriter/oowriterimport.h b/filters/kword/oowriter/oowriterimport.h
index 18f57e68a..80586a312 100644
--- a/filters/kword/oowriter/oowriterimport.h
+++ b/filters/kword/oowriter/oowriterimport.h
@@ -35,7 +35,7 @@ class OoWriterImport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    OoWriterImport( KoFilter * tqparent, const char * name, const TQStringList & );
+    OoWriterImport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoWriterImport();
 
     virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
@@ -50,7 +50,7 @@ private:
     void applyListStyle( TQDomDocument& doc, TQDomElement& layoutElement, const TQDomElement& paragraph );
     void writeCounter( TQDomDocument& doc, TQDomElement& layoutElement, bool heading, int level, bool ordered );
     TQDomElement parseParagraph( TQDomDocument& doc, const TQDomElement& paragraph );
-    void parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& tqparent, TQDomElement& kwordParagraph, TQDomElement& kwordFormats, TQString& paragraphText, uint& pos);
+    void parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& parent, TQDomElement& kwordParagraph, TQDomElement& kwordFormats, TQString& paragraphText, uint& pos);
     // Reads from m_styleStack, writes the text properties to parentElement
     void writeFormat( TQDomDocument& doc, TQDomElement& parentElement, int id, int pos, int length );
     // Reads from m_styleStack, writes the paragraph properties to layoutElement
@@ -60,12 +60,12 @@ private:
     void createStyles( TQDomDocument &doc );
     void createDocumentInfo( TQDomDocument &docinfo );
     void createDocumentContent( TQDomDocument &doccontent, TQDomElement& mainFramesetElement );
-    void parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement );
+    void parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement );
     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& tqparent );
+    void importDateTimeStyle( const TQDomElement& parent );
     void fillStyleStack( const TQDomElement& object, const char* nsURI, const TQString& attrName );
     void addStyles( const TQDomElement* style );
     void importFootnotesConfiguration( TQDomDocument& doc, const TQDomElement& elem, bool endnote );
@@ -82,8 +82,8 @@ private:
         const TQString& key, int type, TQDomElement& child);
     void appendBookmark( TQDomDocument& doc, int paragId, int pos, const TQString& name );
     void appendBookmark( TQDomDocument& doc, int paragId, int pos, int endParagId, int endPos, const TQString& name );
-    void parseTable( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement );
-    void parseInsideOfTable( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement,
+    void parseTable( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement );
+    void parseInsideOfTable( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement,
         const TQString& tableName, const TQMemArray<double> & columnLefts, uint& row, uint& column );
     static TQString kWordStyleName(  const TQString& ooStyleName );
 
diff --git a/filters/kword/palmdoc/palmdocexport.h b/filters/kword/palmdoc/palmdocexport.h
index f63bed735..fd2a11406 100644
--- a/filters/kword/palmdoc/palmdocexport.h
+++ b/filters/kword/palmdoc/palmdocexport.h
@@ -30,7 +30,7 @@ class PalmDocExport : public KoFilter
 
   public:
 
-    PalmDocExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    PalmDocExport(KoFilter *parent, const char *name, const TQStringList&);
     PalmDocExport();
 
     virtual ~PalmDocExport() {}
diff --git a/filters/kword/palmdoc/palmdocimport.h b/filters/kword/palmdoc/palmdocimport.h
index 0f9349330..a97f97298 100644
--- a/filters/kword/palmdoc/palmdocimport.h
+++ b/filters/kword/palmdoc/palmdocimport.h
@@ -32,7 +32,7 @@ class PalmDocImport : public KoFilter
 
   public:
 
-    PalmDocImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    PalmDocImport(KoFilter *parent, const char *name, const TQStringList&);
     PalmDocImport();
 
     virtual ~PalmDocImport() {}
diff --git a/filters/kword/pdf/FilterDevice.cpp b/filters/kword/pdf/FilterDevice.cpp
index b47770c65..5182f1883 100644
--- a/filters/kword/pdf/FilterDevice.cpp
+++ b/filters/kword/pdf/FilterDevice.cpp
@@ -255,7 +255,7 @@ uint Device::initImage(GfxState *state, int width, int height,
 {
     // get image tqgeometry
     Image image;
-    image.tqmask = withMask;
+    image.mask = withMask;
     computeGeometry(state, image);
 
     // check if new image
@@ -263,17 +263,17 @@ uint Device::initImage(GfxState *state, int width, int height,
 //                   << " " << _currentImage.rect.left()
 //                   << " " << _currentImage.rect.right()
 //                   << " " << _currentImage.rect.bottom()
-//                   << " " << _currentImage.tqmask << endl;
+//                   << " " << _currentImage.mask << endl;
 //    kdDebug(30516) << "new image " << width
 //                   << " " << image.rect.left() << " " << image.rect.right()
 //                   << " " << image.rect.top()
-//                   << " " << image.tqmask << endl;
+//                   << " " << image.mask << endl;
     if ( !_currentImage.image.isNull() &&
          (_currentImage.image.width()!=width
           || !equal(image.rect.left(), _currentImage.rect.left())
           || !equal(image.rect.right(), _currentImage.rect.right())
           || !equal(image.rect.top(), _currentImage.rect.bottom())
-          || image.tqmask!=_currentImage.tqmask) )
+          || image.mask!=_currentImage.mask) )
         addImage();
 
     uint offset =
@@ -335,7 +335,7 @@ void Device::drawImageMask(GfxState *state, Object *, Stream *str,
                                  int width, int height, GBool invert,
                                  GBool inlineImg)
 {
-    kdDebug(30516) << "image tqmask ! kind=" << str->getKind()
+    kdDebug(30516) << "image mask ! kind=" << str->getKind()
                    << "inline=" << inlineImg << endl;
     if ( !_data.options().importImages ) return;
 
diff --git a/filters/kword/pdf/FilterDevice.h b/filters/kword/pdf/FilterDevice.h
index 7c4590fac..be106d8d5 100644
--- a/filters/kword/pdf/FilterDevice.h
+++ b/filters/kword/pdf/FilterDevice.h
@@ -96,7 +96,7 @@ public:
 private:
     class Image;
     static void computeGeometry(GfxState *, Image &);
-    uint initImage(GfxState *, int width, int height, bool tqmask);
+    uint initImage(GfxState *, int width, int height, bool mask);
     void addImage();
     void clear();
     static DPathVector convertPath(GfxState *);
@@ -112,7 +112,7 @@ private:
     public:
         TQImage image;
         DRect  rect;
-        bool   tqmask;
+        bool   mask;
     };
     Image _currentImage;
     typedef TQValueList<Image> ImageList;
diff --git a/filters/kword/pdf/dialog.h b/filters/kword/pdf/dialog.h
index 128f9b18b..a5b6150a5 100644
--- a/filters/kword/pdf/dialog.h
+++ b/filters/kword/pdf/dialog.h
@@ -82,7 +82,7 @@ class Dialog : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-    Dialog(uint nbPages, bool isEncrypted, TQWidget *tqparent);
+    Dialog(uint nbPages, bool isEncrypted, TQWidget *parent);
     ~Dialog();
 
     Options options() const;
diff --git a/filters/kword/pdf/pdfimport.h b/filters/kword/pdf/pdfimport.h
index 66b685253..9686714ea 100644
--- a/filters/kword/pdf/pdfimport.h
+++ b/filters/kword/pdf/pdfimport.h
@@ -31,7 +31,7 @@ class PdfImport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    PdfImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    PdfImport(KoFilter *parent, const char *name, const TQStringList&);
 
     KoFilter::ConversiontqStatus
     convert(const TQCString& from, const TQCString& to);
diff --git a/filters/kword/pdf/xpdf/xpdf/FontFile.cc b/filters/kword/pdf/xpdf/xpdf/FontFile.cc
index 283963380..73a7f1d35 100644
--- a/filters/kword/pdf/xpdf/xpdf/FontFile.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FontFile.cc
@@ -1111,7 +1111,7 @@ void Type1CFontFile::convertToType0(const char *psName,
     (*outputFunc)(outputStream, "cleartomark\n", 12);
   }
 
-  // write the Type 0 tqparent font
+  // write the Type 0 parent font
   (*outputFunc)(outputStream, "16 dict begin\n", 14);
   (*outputFunc)(outputStream, "/FontName /", 11);
   (*outputFunc)(outputStream, psName, strlen(psName));
@@ -1572,7 +1572,7 @@ void Type1CFontFile::cvtGlyph(const Guchar *s, int n) {
       }
       i += 2;
       nOps = 0;
-    } else if (s[i] == 19) {	// hinttqmask
+    } else if (s[i] == 19) {	// hintmask
       // ignored
       if (first) {
 	cvtGlyphWidth(nOps == 1);
@@ -1580,14 +1580,14 @@ void Type1CFontFile::cvtGlyph(const Guchar *s, int n) {
       }
       if (nOps > 0) {
 	if (nOps & 1) {
-	  error(-1, "Wrong number of args (%d) to Type 2 hinttqmask/vstemhm",
+	  error(-1, "Wrong number of args (%d) to Type 2 hintmask/vstemhm",
 		nOps);
 	}
 	nHints += nOps / 2;
       }
       i += 1 + ((nHints + 7) >> 3);
       nOps = 0;
-    } else if (s[i] == 20) {	// cntrtqmask
+    } else if (s[i] == 20) {	// cntrmask
       // ignored
       if (first) {
 	cvtGlyphWidth(nOps == 1);
@@ -1595,7 +1595,7 @@ void Type1CFontFile::cvtGlyph(const Guchar *s, int n) {
       }
       if (nOps > 0) {
 	if (nOps & 1) {
-	  error(-1, "Wrong number of args (%d) to Type 2 cntrtqmask/vstemhm",
+	  error(-1, "Wrong number of args (%d) to Type 2 cntrmask/vstemhm",
 		nOps);
 	}
 	nHints += nOps / 2;
@@ -3063,7 +3063,7 @@ void TrueTypeFontFile::convertToType0(const char *name, const Gushort *cidMap,
 		  "FontName currentdict end definefont pop\n", 40);
   }
 
-  // write the Type 0 tqparent font
+  // write the Type 0 parent font
   (*outputFunc)(outputStream, "16 dict begin\n", 14);
   (*outputFunc)(outputStream, "/FontName /", 11);
   (*outputFunc)(outputStream, name, strlen(name));
diff --git a/filters/kword/pdf/xpdf/xpdf/Gfx.cc b/filters/kword/pdf/xpdf/xpdf/Gfx.cc
index 53999975e..7948d78ae 100644
--- a/filters/kword/pdf/xpdf/xpdf/Gfx.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Gfx.cc
@@ -2259,7 +2259,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
   Dict *dict;
   int width, height;
   int bits;
-  GBool tqmask;
+  GBool mask;
   GBool invert;
   GfxColorSpace *colorSpace;
   GfxImageColorMap *colorMap;
@@ -2292,15 +2292,15 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
   height = obj1.getInt();
   obj1.free();
 
-  // image or tqmask?
+  // image or mask?
   dict->lookup("ImageMask", &obj1);
   if (obj1.isNull()) {
     obj1.free();
     dict->lookup("IM", &obj1);
   }
-  tqmask = gFalse;
+  mask = gFalse;
   if (obj1.isBool())
-    tqmask = obj1.getBool();
+    mask = obj1.getBool();
   else if (!obj1.isNull())
     goto err2;
   obj1.free();
@@ -2316,10 +2316,10 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
   bits = obj1.getInt();
   obj1.free();
 
-  // display a tqmask
-  if (tqmask) {
+  // display a mask
+  if (mask) {
 
-    // check for inverted tqmask
+    // check for inverted mask
     if (bits != 1)
       goto err1;
     invert = gFalse;
@@ -2375,7 +2375,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
       goto err1;
     }
 
-    // get the tqmask
+    // get the mask
     haveMask = gFalse;
     dict->lookup("Mask", &maskObj);
     if (maskObj.isArray()) {
diff --git a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
index ec76e1ccf..6312cacae 100644
--- a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
+++ b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
@@ -682,11 +682,11 @@ GBool JBIG2HuffmanDecoder::decodeInt(int *x, JBIG2HuffmanTable *table) {
 }
 
 Guint JBIG2HuffmanDecoder::readBits(Guint n) {
-  Guint x, tqmask, nLeft;
+  Guint x, mask, nLeft;
 
-  tqmask = (n == 32) ? 0xffffffff : ((1 << n) - 1);
+  mask = (n == 32) ? 0xffffffff : ((1 << n) - 1);
   if (bufLen >= n) {
-    x = (buf >> (bufLen - n)) & tqmask;
+    x = (buf >> (bufLen - n)) & mask;
     bufLen -= n;
   } else {
     x = buf & ((1 << bufLen) - 1);
@@ -1101,7 +1101,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
 
   for (yy = y0; yy < y1; ++yy) {
 
-    // one byte per line -- need to tqmask both left and right side
+    // one byte per line -- need to mask both left and right side
     if (oneByte) {
       if (x >= 0) {
 	destPtr = data + (y + yy) * line + (x >> 3);
@@ -1151,7 +1151,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
 	*destPtr = dest;
       }
 
-    // multiple bytes per line -- need to tqmask left side of left-most
+    // multiple bytes per line -- need to mask left side of left-most
     // byte and right side of right-most byte
     } else {
 
diff --git a/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc
index 453b08620..34432991d 100644
--- a/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc
@@ -72,7 +72,7 @@ void PBMOutputDev::killPBMOutputDev(PBMOutputDev *out) {
 
   delete out;
 
-  // these have to be done *after* the XOutputDev (tqparent of the
+  // these have to be done *after* the XOutputDev (parent of the
   // PBMOutputDev) is deleted, since XOutputDev::~XOutputDev() needs
   // them
   XFreePixmap(displayA, pixmapA);
diff --git a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc
index 671d0599a..111d8717b 100644
--- a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc
@@ -315,7 +315,7 @@ static char *prolog[] = {
   "} def",
   "/pdfImM1 {",
   "  /pdfImBuf1 4 index 7 add 8 idiv string def",
-  "  { currentfile pdfImBuf1 readhexstring pop } imagetqmask",
+  "  { currentfile pdfImBuf1 readhexstring pop } imagemask",
   "} def",
   "% Level 2 image operators",
   "/pdfImBuf 100 string def",
@@ -340,7 +340,7 @@ static char *prolog[] = {
   "    (%-EOD-) eq { exit } if } loop",
   "} def",
   "/pdfImM {",
-  "  fCol imagetqmask",
+  "  fCol imagemask",
   "  { currentfile pdfImBuf readline",
   "    not { pop exit } if",
   "    (%-EOD-) eq { exit } if } loop",
@@ -2287,7 +2287,7 @@ void PSOutputDev::doImageL1(GfxImageColorMap *colorMap,
     }
     delete imgStr;
 
-  // imagetqmask
+  // imagemask
   } else {
     str->reset();
     i = 0;
@@ -2478,7 +2478,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
     writePS("  /DataSource { 2 copy get exch 1 add exch }\n");
 
     // end of image dictionary
-    writePSFmt(">>\n%s\n", colorMap ? "image" : "imagetqmask");
+    writePSFmt(">>\n%s\n", colorMap ? "image" : "imagemask");
 
     // get rid of the array and index
     writePS("pop pop\n");
diff --git a/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc
index dc37ee218..3c58f5650 100644
--- a/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc
@@ -1627,7 +1627,7 @@ XOutputDev::XOutputDev(Display *displayA, int screenNumA,
   XVisualInfo visualTempl;
   XVisualInfo *visualList;
   int nVisuals;
-  Gulong tqmask;
+  Gulong mask;
   XColor xcolor;
   XColor *xcolors;
   int r, g, b, n, m;
@@ -1662,18 +1662,18 @@ XOutputDev::XOutputDev(Display *displayA, int screenNumA,
     depth = visualList->depth;
     if (visualList->c_class == TrueColor) {
       trueColor = gTrue;
-      for (tqmask = visualList->red_tqmask, rShift = 0;
-	   tqmask && !(tqmask & 1);
-	   tqmask >>= 1, ++rShift) ;
-      rMul = (int)tqmask;
-      for (tqmask = visualList->green_tqmask, gShift = 0;
-	   tqmask && !(tqmask & 1);
-	   tqmask >>= 1, ++gShift) ;
-      gMul = (int)tqmask;
-      for (tqmask = visualList->blue_tqmask, bShift = 0;
-	   tqmask && !(tqmask & 1);
-	   tqmask >>= 1, ++bShift) ;
-      bMul = (int)tqmask;
+      for (mask = visualList->red_mask, rShift = 0;
+	   mask && !(mask & 1);
+	   mask >>= 1, ++rShift) ;
+      rMul = (int)mask;
+      for (mask = visualList->green_mask, gShift = 0;
+	   mask && !(mask & 1);
+	   mask >>= 1, ++gShift) ;
+      gMul = (int)mask;
+      for (mask = visualList->blue_mask, bShift = 0;
+	   mask && !(mask & 1);
+	   mask >>= 1, ++bShift) ;
+      bMul = (int)mask;
     } else {
       trueColor = gFalse;
     }
@@ -3162,7 +3162,7 @@ void XOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
   XGetSubImage(display, pixmap, cx0, cy0, cw, ch, (1 << depth) - 1, ZPixmap,
 	       image, cx1, cy1);
 
-  // get tqmask color
+  // get mask color
   state->getFillRGB(&rgb);
   if (reverseVideo) {
     rgb.r = 1 - rgb.r;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
index 5c53ade12..8376ce97d 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
@@ -302,7 +302,7 @@ int XPDFCore::loadFile(GString *fileName, GString *ownerPassword,
   // save the modification time
   modTime = getModTime(doc->getFileName()->getCString());
 
-  // update the tqparent window
+  // update the parent window
   if (updateCbk) {
     (*updateCbk)(updateCbkData, doc->getFileName(), -1,
 		 doc->getNumPages(), NULL);
@@ -495,7 +495,7 @@ void XPDFCore::displayPage(int pageA, int zoomA, int rotateA,
     historyFLen = 0;
   }
 
-  // update the tqparent window
+  // update the parent window
   if (updateCbk) {
     (*updateCbk)(updateCbkData, NULL, page, -1, "");
   }
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
index adc7f5073..348486f0f 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
@@ -229,7 +229,7 @@ private:
   Visual *visual;
   Colormap colormap;
   Widget shell;			// top-level shell containing the widget
-  Widget parentWidget;		// tqparent widget (not created by XPDFCore)
+  Widget parentWidget;		// parent widget (not created by XPDFCore)
   Widget scrolledWin;
   Widget hScrollBar;
   Widget vScrollBar;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
index 28e01de6c..290861b94 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
@@ -393,7 +393,7 @@ static void setValuesAlmost(Widget oldWidget, Widget newWidget,
 			    XtWidgetGeometry *reply) {
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(newWidget);
 
-  // our tqparent rejected a tqgeometry request, so accept the compromise
+  // our parent rejected a tqgeometry request, so accept the compromise
   // and retqlayout
   if (!reply->request_mode) {
     if (cls->treeClass.tqlayout) {
@@ -480,7 +480,7 @@ static XtGeometryResult geometryManager(Widget widget,
     calcSize((Widget)w, widget, &parentReq.width, &reply->height);
   }
 
-  // send tqgeometry request to our tqparent
+  // send tqgeometry request to our parent
   parentReq.request_mode = CWWidth | CWHeight;
   if (request->request_mode & XtCWQueryOnly) {
     parentReq.request_mode |= XtCWQueryOnly;
@@ -524,7 +524,7 @@ static void changeManaged(Widget widget) {
     calcSize(widget, NULL, &width, &height);
   }
 
-  // make resize request to tqparent -- keep asking until we get a yes
+  // make resize request to parent -- keep asking until we get a yes
   // or no
   while (XtMakeResizeRequest(widget, width, height, &width, &height)
 	 == XtGeometryAlmost) ;
@@ -629,7 +629,7 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
       calcSize((Widget)w, NULL, &width, &height);
     }
 
-    // make resize request to tqparent -- keep asking until we get a yes
+    // make resize request to parent -- keep asking until we get a yes
     // or no
     while (XtMakeResizeRequest((Widget)w, width, height, &width, &height)
 	   == XtGeometryAlmost) ;
@@ -923,7 +923,7 @@ static Boolean findPositionInSubtree(XPDFTreeWidget w, int x, int y,
   return False;
 }
 
-Widget XPDFCreateTree(Widget tqparent, char *name,
+Widget XPDFCreateTree(Widget parent, char *name,
 		      ArgList argList, Cardinal numArgs) {
-  return XtCreateWidget(name, xpdfTreeWidgetClass, tqparent, argList, numArgs);
+  return XtCreateWidget(name, xpdfTreeWidgetClass, parent, argList, numArgs);
 }
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.h b/filters/kword/pdf/xpdf/xpdf/XPDFTree.h
index 93e3fb77a..d569f4987 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.h
@@ -35,7 +35,7 @@ typedef struct {
   Widget selectedItem;
 } XPDFTreeSelectCallbackStruct;
 
-extern Widget XPDFCreateTree(Widget tqparent, char *name,
+extern Widget XPDFCreateTree(Widget parent, char *name,
 			     ArgList argList, Cardinal argCount);
 
 } // extern "C"
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
index a75830b83..de691914e 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
@@ -1484,7 +1484,7 @@ void XPDFViewer::setupOutline() {
   XtManageChildren(outlineLabels, outlineLabelsLength);
 }
 
-void XPDFViewer::setupOutlineItems(GList *items, Widget tqparent,
+void XPDFViewer::setupOutlineItems(GList *items, Widget parent,
 				   UnicodeMap *uMap) {
   OutlineItem *item;
   GList *kids;
@@ -1504,8 +1504,8 @@ void XPDFViewer::setupOutlineItems(GList *items, Widget tqparent,
     }
     n = 0;
     XtSetArg(args[n], XPDFNentryPosition, i); ++n;
-    if (tqparent) {
-      XtSetArg(args[n], XPDFNentryParent, tqparent); ++n;
+    if (parent) {
+      XtSetArg(args[n], XPDFNentryParent, parent); ++n;
     }
     XtSetArg(args[n], XPDFNentryExpanded, item->isOpen()); ++n;
     s = XmStringCreateLocalized(title->getCString());
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h
index b9b0b2dab..77875c416 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h
@@ -124,7 +124,7 @@ private:
   //----- GUI code: outline
 #ifndef DISABLE_OUTLINE
   void setupOutline();
-  void setupOutlineItems(GList *items, Widget tqparent, UnicodeMap *uMap);
+  void setupOutlineItems(GList *items, Widget parent, UnicodeMap *uMap);
   static void outlineSelectCbk(Widget widget, XtPointer ptr,
 			       XtPointer callData);
 #endif
diff --git a/filters/kword/rtf/export/rtfexport.h b/filters/kword/rtf/export/rtfexport.h
index e5276f1a8..060139ed6 100644
--- a/filters/kword/rtf/export/rtfexport.h
+++ b/filters/kword/rtf/export/rtfexport.h
@@ -36,7 +36,7 @@ class RTFExport : public KoFilter {
   TQ_OBJECT
 
 public:
-    RTFExport(KoFilter *tqparent, const char *name, const TQStringList &);
+    RTFExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~RTFExport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index 2526a6b00..94fad6970 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -1583,7 +1583,7 @@ void RTFImport::addImportedPicture( const TQString& rawFileName )
     kdDebug(30515) << "Path: " << url.prettyURL() << endl;
 
     KoPicture pic;
-    pic.setKeyAndDownloadPicture(url, 0); // ### TODO: find a better tqparent if possible
+    pic.setKeyAndDownloadPicture(url, 0); // ### TODO: find a better parent if possible
     if (pic.isNull())
     {
         kdError(30515) << "Import field: file is empty: " << rawFileName << endl;
diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h
index fd39b4355..bf4f20b74 100644
--- a/filters/kword/rtf/import/rtfimport.h
+++ b/filters/kword/rtf/import/rtfimport.h
@@ -247,7 +247,7 @@ class RTFImport : public KoFilter
   TQ_OBJECT
 
 public:
-    RTFImport( KoFilter *tqparent, const char *name, const TQStringList& );
+    RTFImport( KoFilter *parent, const char *name, const TQStringList& );
 
     /**
      * Convert document from RTF to KWord format.
diff --git a/filters/kword/starwriter/pole.cpp b/filters/kword/starwriter/pole.cpp
index 96b3e82c2..d9751e15a 100644
--- a/filters/kword/starwriter/pole.cpp
+++ b/filters/kword/starwriter/pole.cpp
@@ -31,7 +31,7 @@ namespace POLE
 class Entry
 {
   public:
-    Entry* tqparent;
+    Entry* parent;
     std::string name;
     unsigned long size;
     unsigned start;
@@ -153,7 +153,7 @@ class StorageIO
     unsigned long loadSmallBlock( unsigned long block, unsigned char* buffer, unsigned long maxlen );
 
     /// construct directory tree
-    Entry* buildTree( Entry* tqparent, int index, const unsigned char* dirent );
+    Entry* buildTree( Entry* parent, int index, const unsigned char* dirent );
 
     std::string fullName( Entry* e );
 
@@ -619,7 +619,7 @@ unsigned long StorageIO::loadSmallBlock( unsigned long block,
 }
 
 // recursive function to construct directory tree
-Entry* StorageIO::buildTree( Entry* tqparent, int index, const unsigned char* dirent )
+Entry* StorageIO::buildTree( Entry* parent, int index, const unsigned char* dirent )
 {
   Entry* entry = (Entry*) 0L;
 
@@ -656,12 +656,12 @@ Entry* StorageIO::buildTree( Entry* tqparent, int index, const unsigned char* di
   entry->size  = readU32( dirent + 0x78+p );
 
   // append as another child
-  entry->tqparent = tqparent;
-  if( tqparent ) tqparent->tqchildren.push_back( entry );
+  entry->parent = parent;
+  if( parent ) parent->tqchildren.push_back( entry );
 
   // check previous
   int prev  = readU32( dirent + 0x44+p );
-  if( prev >= 0 ) buildTree( tqparent, prev, dirent );
+  if( prev >= 0 ) buildTree( parent, prev, dirent );
   
   // traverse to sub
   int dir   = readU32( dirent + 0x4C+p );
@@ -670,7 +670,7 @@ Entry* StorageIO::buildTree( Entry* tqparent, int index, const unsigned char* di
 
   // check next
   int next  = readU32( dirent + 0x48+p );
-  if( next >= 0 ) buildTree( tqparent, next, dirent );
+  if( next >= 0 ) buildTree( parent, next, dirent );
   return entry;
 }
 
@@ -681,11 +681,11 @@ std::string StorageIO::fullName( Entry* e )
 
   std::string result;
 
-  while( e->tqparent )
+  while( e->parent )
   {
      result.insert( 0, e->name );
      result.insert( 0,  "/" );
-     e = e->tqparent;
+     e = e->parent;
   }
 
   // don't use specified root name (like "Root Entry")
@@ -750,7 +750,7 @@ StreamIO::StreamIO( StorageIO* _io, Entry* _entry ):
   updateCache();
 }
 
-// FIXME tell tqparent we're gone
+// FIXME tell parent we're gone
 StreamIO::~StreamIO()
 {
   delete[] cache_data;  
@@ -951,9 +951,9 @@ void Storage::leaveDirectory()
   if( !io ) return;
   if( !io->current_dir ) return;
 
-  Entry* tqparent = io->current_dir->tqparent;
-  if( tqparent ) if( tqparent->dir ) 
-    io->current_dir = tqparent;
+  Entry* parent = io->current_dir->parent;
+  if( parent ) if( parent->dir ) 
+    io->current_dir = parent;
 }
 
 // note: without trailing "/"
@@ -993,7 +993,7 @@ Stream::Stream( StreamIO* _io ):
 {
 }
 
-// FIXME tell tqparent we're gone
+// FIXME tell parent we're gone
 Stream::~Stream()
 {
   delete io;
diff --git a/filters/kword/starwriter/starwriterimport.h b/filters/kword/starwriter/starwriterimport.h
index acb91a026..b030c2ba1 100644
--- a/filters/kword/starwriter/starwriterimport.h
+++ b/filters/kword/starwriter/starwriterimport.h
@@ -32,7 +32,7 @@ class StarWriterImport: public KoFilter
   TQ_OBJECT
 
 public:
-    StarWriterImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    StarWriterImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~StarWriterImport();
     KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 
diff --git a/filters/kword/wml/wmlexport.h b/filters/kword/wml/wmlexport.h
index 0fbd4f453..8d3a105eb 100644
--- a/filters/kword/wml/wmlexport.h
+++ b/filters/kword/wml/wmlexport.h
@@ -30,7 +30,7 @@ class WMLExport : public KoFilter
 
   public:
 
-    WMLExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    WMLExport(KoFilter *parent, const char *name, const TQStringList&);
     WMLExport();
 
     virtual ~WMLExport() {}
diff --git a/filters/kword/wml/wmlimport.h b/filters/kword/wml/wmlimport.h
index 903cb9e07..049ff8dbd 100644
--- a/filters/kword/wml/wmlimport.h
+++ b/filters/kword/wml/wmlimport.h
@@ -32,7 +32,7 @@ class WMLImport : public KoFilter
 
   public:
 
-    WMLImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    WMLImport(KoFilter *parent, const char *name, const TQStringList&);
     WMLImport();
 
     virtual ~WMLImport() {}
diff --git a/filters/kword/wordperfect/export/wpexport.h b/filters/kword/wordperfect/export/wpexport.h
index 4c819ba4f..55f43a478 100644
--- a/filters/kword/wordperfect/export/wpexport.h
+++ b/filters/kword/wordperfect/export/wpexport.h
@@ -30,7 +30,7 @@ class WPExport : public KoFilter
 
   public:
 
-    WPExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    WPExport(KoFilter *parent, const char *name, const TQStringList&);
     WPExport();
 
     virtual ~WPExport() {}
diff --git a/filters/kword/wordperfect/import/TextRunStyle.cxx b/filters/kword/wordperfect/import/TextRunStyle.cxx
index 2860df9a2..702dddb59 100644
--- a/filters/kword/wordperfect/import/TextRunStyle.cxx
+++ b/filters/kword/wordperfect/import/TextRunStyle.cxx
@@ -58,7 +58,7 @@ void ParagraphStyle::write(DocumentHandler &xHandler) const
         WPXPropertyList propList;
 	propList.insert("style:name", msName.cstr());
 	propList.insert("style:family", "paragraph");
-	propList.insert("style:tqparent-style-name", (*mpPropList)["style:tqparent-style-name"]->getStr());
+	propList.insert("style:parent-style-name", (*mpPropList)["style:parent-style-name"]->getStr());
 	if ((*mpPropList)["style:master-page-name"])
 		propList.insert("style:master-page-name", (*mpPropList)["style:master-page-name"]->getStr());
         xHandler.startElement("style:style", propList);
diff --git a/filters/kword/wordperfect/import/WordPerfectCollector.cxx b/filters/kword/wordperfect/import/WordPerfectCollector.cxx
index bfcd4359f..33fb4816a 100644
--- a/filters/kword/wordperfect/import/WordPerfectCollector.cxx
+++ b/filters/kword/wordperfect/import/WordPerfectCollector.cxx
@@ -178,7 +178,7 @@ void WordPerfectCollector::_writeDefaultStyles(DocumentHandler &xHandler)
         TagOpenElement textBodyStyleOpenElement("style:style");
         textBodyStyleOpenElement.addAttribute("style:name", "Text Body");
         textBodyStyleOpenElement.addAttribute("style:family", "paragraph");
-        textBodyStyleOpenElement.addAttribute("style:tqparent-style-name", "Standard");
+        textBodyStyleOpenElement.addAttribute("style:parent-style-name", "Standard");
         textBodyStyleOpenElement.addAttribute("style:class", "text");
         textBodyStyleOpenElement.write(xHandler);
         TagCloseElement textBodyStyleCloseElement("style:style");
@@ -187,7 +187,7 @@ void WordPerfectCollector::_writeDefaultStyles(DocumentHandler &xHandler)
         TagOpenElement tableContentsStyleOpenElement("style:style");
         tableContentsStyleOpenElement.addAttribute("style:name", "Table Contents");
         tableContentsStyleOpenElement.addAttribute("style:family", "paragraph");
-        tableContentsStyleOpenElement.addAttribute("style:tqparent-style-name", "Text Body");
+        tableContentsStyleOpenElement.addAttribute("style:parent-style-name", "Text Body");
         tableContentsStyleOpenElement.addAttribute("style:class", "extra");
         tableContentsStyleOpenElement.write(xHandler);
         TagCloseElement tableContentsStyleCloseElement("style:style");
@@ -196,7 +196,7 @@ void WordPerfectCollector::_writeDefaultStyles(DocumentHandler &xHandler)
         TagOpenElement tableHeadingStyleOpenElement("style:style");
         tableHeadingStyleOpenElement.addAttribute("style:name", "Table Heading");
         tableHeadingStyleOpenElement.addAttribute("style:family", "paragraph");
-        tableHeadingStyleOpenElement.addAttribute("style:tqparent-style-name", "Table Contents");
+        tableHeadingStyleOpenElement.addAttribute("style:parent-style-name", "Table Contents");
         tableHeadingStyleOpenElement.addAttribute("style:class", "extra");
         tableHeadingStyleOpenElement.write(xHandler);
         TagCloseElement tableHeadingStyleCloseElement("style:style");
@@ -484,10 +484,10 @@ void WordPerfectCollector::openParagraph(const WPXPropertyList &propList, const
 	{
 		// we don't have to go through the fuss of determining if the paragraph style is 
 		// unique in this case, because if we are the first document element, then we
-		// are singular. Neither do we have to determine what our tqparent style is-- we can't
+		// are singular. Neither do we have to determine what our parent style is-- we can't
 		// be inside a table in this case (the table would be the first document element 
 		//in that case)
-		pPersistPropList->insert("style:tqparent-style-name", "Standard");
+		pPersistPropList->insert("style:parent-style-name", "Standard");
 		WPXString sName;
 		sName.sprintf("FS");
 
@@ -502,12 +502,12 @@ void WordPerfectCollector::openParagraph(const WPXPropertyList &propList, const
 		if (mWriterDocumentState.mbTableCellOpened)
 		{
 			if (mWriterDocumentState.mbHeaderRow)
-				pPersistPropList->insert("style:tqparent-style-name", "Table Heading");
+				pPersistPropList->insert("style:parent-style-name", "Table Heading");
 			else
-				pPersistPropList->insert("style:tqparent-style-name", "Table Contents");
+				pPersistPropList->insert("style:parent-style-name", "Table Contents");
 		}
 		else
-			pPersistPropList->insert("style:tqparent-style-name", "Standard");
+			pPersistPropList->insert("style:parent-style-name", "Standard");
 
                 WPXString sKey = getParagraphStyleKey(*pPersistPropList, tabStops);
 
@@ -717,7 +717,7 @@ void WordPerfectCollector::openListElement(const WPXPropertyList &propList, cons
 
 	WPXPropertyList *pPersistPropList = new WPXPropertyList(propList);
 	pPersistPropList->insert("style:list-style-name", mpCurrentListStyle->getName());
-	pPersistPropList->insert("style:tqparent-style-name", "Standard");
+	pPersistPropList->insert("style:parent-style-name", "Standard");
 
         WPXString sKey = getParagraphStyleKey(*pPersistPropList, tabStops);
 
diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc
index f462fd093..460915af0 100644
--- a/filters/kword/wordperfect/import/wpimport.cc
+++ b/filters/kword/wordperfect/import/wpimport.cc
@@ -300,14 +300,14 @@ KoFilter::ConversiontqStatus WPImport::convert( const TQCString& from, const TQC
 <style:default-style style:family=\"table-row\"/>\
 <style:default-style style:family=\"table-column\"/>\
 <style:style style:name=\"Standard\" style:family=\"paragraph\" style:class=\"text\"/>\
-<style:style style:name=\"Text body\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"text\"/>\
-<style:style style:name=\"List\" style:family=\"paragraph\" style:tqparent-style-name=\"Text body\" style:class=\"list\"/>\
-<style:style style:name=\"Header\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"extra\"/>\
-<style:style style:name=\"Footer\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"extra\"/>\
-<style:style style:name=\"Caption\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"extra\"/>\
-<style:style style:name=\"Footnote\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"extra\"/>\
-<style:style style:name=\"Endnote\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"extra\"/>\
-<style:style style:name=\"Index\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"index\"/>\
+<style:style style:name=\"Text body\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"text\"/>\
+<style:style style:name=\"List\" style:family=\"paragraph\" style:parent-style-name=\"Text body\" style:class=\"list\"/>\
+<style:style style:name=\"Header\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"extra\"/>\
+<style:style style:name=\"Footer\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"extra\"/>\
+<style:style style:name=\"Caption\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"extra\"/>\
+<style:style style:name=\"Footnote\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"extra\"/>\
+<style:style style:name=\"Endnote\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"extra\"/>\
+<style:style style:name=\"Index\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"index\"/>\
 <style:style style:name=\"Footnote Symbol\" style:family=\"text\">\
 <style:properties style:text-position=\"super 58%\"/>\
 </style:style>\
diff --git a/filters/kword/wordperfect/import/wpimport.h b/filters/kword/wordperfect/import/wpimport.h
index 862b76837..02cd323d2 100644
--- a/filters/kword/wordperfect/import/wpimport.h
+++ b/filters/kword/wordperfect/import/wpimport.h
@@ -43,7 +43,7 @@ class WPImport : public KoFilter
 
   public:
 
-    WPImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    WPImport(KoFilter *parent, const char *name, const TQStringList&);
     WPImport();
 
     virtual ~WPImport() {}
diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp
index adce4a56b..f079e2a51 100644
--- a/filters/libdialogfilter/exportsizedia.cpp
+++ b/filters/libdialogfilter/exportsizedia.cpp
@@ -37,8 +37,8 @@
 
 
 ExportSizeDia::ExportSizeDia( int width, int height, 
-			    TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name, true,
+			    TQWidget *parent, const char *name )
+    : KDialogBase( parent, name, true,
 		   i18n("Export Filter Parameters" ), Ok|Cancel )
 {
     kapp->restoreOverrideCursor();
diff --git a/filters/libdialogfilter/exportsizedia.h b/filters/libdialogfilter/exportsizedia.h
index 2eba6ccba..6d6459ccc 100644
--- a/filters/libdialogfilter/exportsizedia.h
+++ b/filters/libdialogfilter/exportsizedia.h
@@ -37,7 +37,7 @@ class ExportSizeDia : public KDialogBase
 
 public:
     ExportSizeDia( int width, int height, 
-		  TQWidget *tqparent=0L, const char *name=0L );
+		  TQWidget *parent=0L, const char *name=0L );
     ~ExportSizeDia();
 
     int  width() const;
diff --git a/filters/olefilters/lib/klaola.cc b/filters/olefilters/lib/klaola.cc
index 80f57f0ff..28af157c8 100644
--- a/filters/olefilters/lib/klaola.cc
+++ b/filters/olefilters/lib/klaola.cc
@@ -512,7 +512,7 @@ TQString KLaola::Node::describe() const
         description += ", OLE_2";
         break;
     case PARENT_MANAGED:
-        description += ", tqparent managed";
+        description += ", parent managed";
         break;
     case STRUCTURED_STORAGE:
         description += ", reserved 0x" + TQString::number(m_prefix, 16);
diff --git a/filters/olefilters/lib/klaola.h b/filters/olefilters/lib/klaola.h
index fd44aa561..ab1e95b4e 100644
--- a/filters/olefilters/lib/klaola.h
+++ b/filters/olefilters/lib/klaola.h
@@ -124,7 +124,7 @@ public:
         CLSID,
         OLE_MANAGED_2,
         PARENT_MANAGED,         // Marks an element as owned by the code that
-                                // manages the tqparent storage of that element.
+                                // manages the parent storage of that element.
         STRUCTURED_STORAGE,     // For the exclusive use of the Structured Storage
                                 // implementation.
         RESERVED_FIRST,
diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc
index 9d1ded51f..ef4f6cd06 100644
--- a/filters/olefilters/olefilter.cc
+++ b/filters/olefilters/olefilter.cc
@@ -19,7 +19,7 @@
 DESCRIPTION
 
    When reading, the point of this module is toperform a depth-first traversal
-   of an OLE file. This ensures that a tqparent object is processed only after
+   of an OLE file. This ensures that a parent object is processed only after
    its child objects have been processed.
 */
 
diff --git a/filters/olefilters/olefilter.h b/filters/olefilters/olefilter.h
index 0be2a8bab..80a037373 100644
--- a/filters/olefilters/olefilter.h
+++ b/filters/olefilters/olefilter.h
@@ -36,7 +36,7 @@ class OLEFilter : public KoEmbeddingFilter {
   TQ_OBJECT
 
 public:
-    OLEFilter(KoFilter *tqparent, const char *name, const TQStringList&);
+    OLEFilter(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~OLEFilter();
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/xsltfilter/export/xsltexport.h b/filters/xsltfilter/export/xsltexport.h
index 24ee30442..eac9712ab 100644
--- a/filters/xsltfilter/export/xsltexport.h
+++ b/filters/xsltfilter/export/xsltexport.h
@@ -29,7 +29,7 @@ class XSLTExport : public KoFilter
   TQ_OBJECT
 
 public:
-    XSLTExport(KoFilter *tqparent, const char *name, const TQStringList&);
+    XSLTExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~XSLTExport() {}
 
     virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc
index b77e91280..2f9f4fc6b 100644
--- a/filters/xsltfilter/export/xsltexportdia.cc
+++ b/filters/xsltfilter/export/xsltexportdia.cc
@@ -42,14 +42,14 @@
 #endif*/
 
 /*
- *  Constructs a XSLTExportDia which is a child of 'tqparent', with the
+ *  Constructs a XSLTExportDia which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidget* tqparent,  const char* name_, bool modal, WFlags fl )
-    : XSLTDialog( tqparent, name_, modal, fl )
+XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidget* parent,  const char* name_, bool modal, WFlags fl )
+    : XSLTDialog( parent, name_, modal, fl )
 {
 	int i = 0;
 	_in = in;
diff --git a/filters/xsltfilter/export/xsltexportdia.h b/filters/xsltfilter/export/xsltexportdia.h
index 31491d719..9fd808701 100644
--- a/filters/xsltfilter/export/xsltexportdia.h
+++ b/filters/xsltfilter/export/xsltexportdia.h
@@ -47,7 +47,7 @@ class XSLTExportDia : public XSLTDialog
     TQStringList _namesList;
 
 public:
-    XSLTExportDia( KoStoreDevice*, const TQCString &format, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    XSLTExportDia( KoStoreDevice*, const TQCString &format, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~XSLTExportDia();
 
     void setOutputFile(TQString file) { _fileOut = file; }
diff --git a/filters/xsltfilter/import/xsltimport.h b/filters/xsltfilter/import/xsltimport.h
index 22b899417..fead8d808 100644
--- a/filters/xsltfilter/import/xsltimport.h
+++ b/filters/xsltfilter/import/xsltimport.h
@@ -35,7 +35,7 @@ class XSLTImport : public KoFilter
   TQ_OBJECT
 
 	public:
-    	XSLTImport(KoFilter *tqparent, const char *name, const TQStringList&);
+    	XSLTImport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~XSLTImport() {}
 
 		virtual KoFilter::ConversiontqStatus convert( const TQCString& from,
diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc
index 0d55c309b..2e278bf2d 100644
--- a/filters/xsltfilter/import/xsltimportdia.cc
+++ b/filters/xsltfilter/import/xsltimportdia.cc
@@ -39,14 +39,14 @@
 #include <xsltproc.h>
 
 /*
- *  Constructs a XSLTImportDia which is a child of 'tqparent', with the
+ *  Constructs a XSLTImportDia which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* tqparent,  const char* name_, bool modal, WFlags fl )
-    : XSLTDialog( tqparent, name_, modal, fl )
+XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* parent,  const char* name_, bool modal, WFlags fl )
+    : XSLTDialog( parent, name_, modal, fl )
 {
 	int i = 0;
 	_out = out;
diff --git a/filters/xsltfilter/import/xsltimportdia.h b/filters/xsltfilter/import/xsltimportdia.h
index 1b6a507b8..480606383 100644
--- a/filters/xsltfilter/import/xsltimportdia.h
+++ b/filters/xsltfilter/import/xsltimportdia.h
@@ -47,7 +47,7 @@ class XSLTImportDia : public XSLTDialog
 	TQStringList _namesList;
 
 public:
-    XSLTImportDia(KoStore*, const TQCString &format, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    XSLTImportDia(KoStore*, const TQCString &format, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~XSLTImportDia();
 
 	void setInputFile(TQString file)  { _fileIn = file; }
diff --git a/interfaces/koChart.cc b/interfaces/koChart.cc
index 0037d60b5..d66578ab5 100644
--- a/interfaces/koChart.cc
+++ b/interfaces/koChart.cc
@@ -33,9 +33,9 @@ WizardExtension::~WizardExtension()
 }
 
 Part::Part( TQWidget *parentWidget, const char *widgetName,
-            TQObject *tqparent, const char *name,
+            TQObject *parent, const char *name,
             bool singleViewMode )
-    : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
+    : KoDocument( parentWidget, widgetName, parent, name, singleViewMode )
 {
 }
 
diff --git a/interfaces/koChart.h b/interfaces/koChart.h
index af6623d78..009c00969 100644
--- a/interfaces/koChart.h
+++ b/interfaces/koChart.h
@@ -63,7 +63,7 @@ namespace KoChart
   TQ_OBJECT
     public:
         Part( TQWidget *parentWidget, const char *widgetName,
-              TQObject *tqparent, const char *name,
+              TQObject *parent, const char *name,
               bool singleViewMode = false );
 
         virtual ~Part();
diff --git a/karbon/commands/vgroupcmd.cc b/karbon/commands/vgroupcmd.cc
index d6e9a7fa0..bcad4d936 100644
--- a/karbon/commands/vgroupcmd.cc
+++ b/karbon/commands/vgroupcmd.cc
@@ -47,10 +47,10 @@ VGroupCmd::execute()
 	VObjectListIterator itr( m_selection->objects() );
 	for ( ; itr.current() ; ++itr )
 	{
-		// remove from corresponding tqparent
-		VGroup *tqparent = dynamic_cast<VGroup*>( itr.current()->tqparent() );
-		if( tqparent )
-			tqparent->take( *itr.current() );
+		// remove from corresponding parent
+		VGroup *parent = dynamic_cast<VGroup*>( itr.current()->parent() );
+		if( parent )
+			parent->take( *itr.current() );
 
 		m_group->append( itr.current() );
 	}
@@ -77,18 +77,18 @@ VGroupCmd::unexecute()
 		document()->selection()->append( itr.current() );
 	}
 
-	VGroup* tqparent;
-	if( ( tqparent = dynamic_cast<VGroup*>( m_group->tqparent() ) ) )
+	VGroup* parent;
+	if( ( parent = dynamic_cast<VGroup*>( m_group->parent() ) ) )
 	{
-		// unregister from tqparent:
-		tqparent->take( *m_group );
+		// unregister from parent:
+		parent->take( *m_group );
 
-		// inform all objects in this group about their new tqparent
+		// inform all objects in this group about their new parent
 		VObjectListIterator itr = m_selection->objects();
 
 		for ( ; itr.current() ; ++itr )
 		{
-			tqparent->append( itr.current() );
+			parent->append( itr.current() );
 		}
 
 		m_group->clear();
diff --git a/karbon/commands/vreplacingcmd.cc b/karbon/commands/vreplacingcmd.cc
index d99fe3135..2275dba84 100644
--- a/karbon/commands/vreplacingcmd.cc
+++ b/karbon/commands/vreplacingcmd.cc
@@ -66,7 +66,7 @@ VReplacingCmd::execute()
 				successful = true;
 
 				// Insert new tqshape right before old tqshape.
-				itr.current()->tqparent()->insertInfrontOf(
+				itr.current()->parent()->insertInfrontOf(
 					newObject, itr.current() );
 
 				// Add new tqshape to list of new objects.
diff --git a/karbon/commands/vungroupcmd.cc b/karbon/commands/vungroupcmd.cc
index e1e005310..314a873e6 100644
--- a/karbon/commands/vungroupcmd.cc
+++ b/karbon/commands/vungroupcmd.cc
@@ -53,19 +53,19 @@ VUnGroupCmd::execute()
 		document()->selection()->append( itr.current() );
 	}
 
-	VGroup* tqparent;
-	if( ( tqparent = dynamic_cast<VGroup*>( m_group->tqparent() ) ) )
+	VGroup* parent;
+	if( ( parent = dynamic_cast<VGroup*>( m_group->parent() ) ) )
 	{
-		// unregister from tqparent:
-		tqparent->take( *m_group );
+		// unregister from parent:
+		parent->take( *m_group );
 
-		// inform all objects in this group about their new tqparent
+		// inform all objects in this group about their new parent
 		VObjectListIterator itr = m_group->objects();
 
 		for ( ; itr.current() ; ++itr )
 		{
 			itr.current()->invalidateBoundingBox();
-			tqparent->append( itr.current() );
+			parent->append( itr.current() );
 		}
 
 		m_group->clear();
diff --git a/karbon/core/vclipgroup.cc b/karbon/core/vclipgroup.cc
index 2451f321e..9a36c1c55 100644
--- a/karbon/core/vclipgroup.cc
+++ b/karbon/core/vclipgroup.cc
@@ -32,7 +32,7 @@
 #include "vsegment.h"
 #include <vpainter.h>
 #include "vtext.h"
-VClipGroup::VClipGroup( VObject* tqparent, VState state ) : VGroup( tqparent, state ) {}
+VClipGroup::VClipGroup( VObject* parent, VState state ) : VGroup( parent, state ) {}
 VClipGroup::VClipGroup( const VClipGroup& group ) : VGroup( group ) {}
 
 VClipGroup::~VClipGroup() { }
diff --git a/karbon/core/vclipgroup.h b/karbon/core/vclipgroup.h
index f53055c65..683c3b614 100644
--- a/karbon/core/vclipgroup.h
+++ b/karbon/core/vclipgroup.h
@@ -33,7 +33,7 @@ class VPainter;
 class KARBONBASE_EXPORT VClipGroup : public VGroup
 {
 public:
-	VClipGroup( VObject* tqparent, VState state = normal );
+	VClipGroup( VObject* parent, VState state = normal );
 	VClipGroup ( const VClipGroup& group );
 
 	virtual ~VClipGroup();
diff --git a/karbon/core/vcomposite.cc b/karbon/core/vcomposite.cc
index 7872df5fa..570b06dc5 100644
--- a/karbon/core/vcomposite.cc
+++ b/karbon/core/vcomposite.cc
@@ -44,8 +44,8 @@
 #include <kdebug.h>
 
 
-VPath::VPath( VObject* tqparent, VState state )
-	: VObject( tqparent, state ), m_fillRule( winding )
+VPath::VPath( VObject* parent, VState state )
+	: VObject( parent, state ), m_fillRule( winding )
 {
 	m_paths.setAutoDelete( true );
 
diff --git a/karbon/core/vcomposite.h b/karbon/core/vcomposite.h
index bcac57dd2..c1f6e87ff 100644
--- a/karbon/core/vcomposite.h
+++ b/karbon/core/vcomposite.h
@@ -47,7 +47,7 @@ typedef TQPtrListIterator<VSubpath> VSubpathListIterator;
 class KARBONBASE_EXPORT VPath : public VObject, SVGPathParser
 {
 public:
-	VPath( VObject* tqparent, VState state = normal );
+	VPath( VObject* parent, VState state = normal );
 	VPath( const VPath& path );
 	virtual ~VPath();
 
diff --git a/karbon/core/vcursor.cc b/karbon/core/vcursor.cc
index a44004f20..c5fb2f402 100644
--- a/karbon/core/vcursor.cc
+++ b/karbon/core/vcursor.cc
@@ -92,13 +92,13 @@ TQCursor VCursor::createCursor( CursorType type )
 	}
 }
 
-TQCursor VCursor::createCursor( const char * bitmap[], const char * tqmask[], int hotX, int hotY )
+TQCursor VCursor::createCursor( const char * bitmap[], const char * mask[], int hotX, int hotY )
 {
-	// the cursor bitmap and tqmask
+	// the cursor bitmap and mask
 	TQBitmap b, m;
 
 	b = TQPixmap( (const char**) bitmap );
-	m = TQPixmap( (const char**) tqmask );
+	m = TQPixmap( (const char**) mask );
 	
 	return TQCursor( b, m, hotX, hotY );
 }
diff --git a/karbon/core/vcursor.h b/karbon/core/vcursor.h
index 90ab1673a..ccb4a36f6 100644
--- a/karbon/core/vcursor.h
+++ b/karbon/core/vcursor.h
@@ -27,7 +27,7 @@
 * A helper class for easily creating cursors from XPMs.
 *
 * One can create a predefined unthemed cursor or create a cursor from two given XMPs, 
-* the cursor bitmap and the cursor tqmask.
+* the cursor bitmap and the cursor mask.
 */
 class KARBONBASE_EXPORT VCursor
 {
@@ -53,7 +53,7 @@ public:
 	 * Creates a cursor from two specified XPM images.
 	 * This is only a wrapper function for a TQCursor ctor.
 	 */
-	static TQCursor createCursor( const char * bitmap[], const char * tqmask[], int hotX = -1, int hotY = -1 );
+	static TQCursor createCursor( const char * bitmap[], const char * mask[], int hotX = -1, int hotY = -1 );
 
 	/** crosshair cursor */
 	static TQCursor crossHair();
diff --git a/karbon/core/vfill.cc b/karbon/core/vfill.cc
index 549045ae8..d1cd9d13f 100644
--- a/karbon/core/vfill.cc
+++ b/karbon/core/vfill.cc
@@ -48,7 +48,7 @@ VFill::VFill( const VColor &c )
 
 VFill::VFill( const VFill& fill )
 {
-	// doesn't copy tqparent:
+	// doesn't copy parent:
 	*this = fill;
 }
 
@@ -100,7 +100,7 @@ VFill::saveOasis( KoGenStyles &mainStyles, KoGenStyle &style ) const
 }
 
 void
-VFill::loadOasis( const TQDomElement &/*object*/, KoOasisLoadingContext &context, VObject* tqparent )
+VFill::loadOasis( const TQDomElement &/*object*/, KoOasisLoadingContext &context, VObject* parent )
 {
 	KoStyleStack &stack = context.styleStack();
 	if( stack.hasAttributeNS( KoXmlNS::draw, "fill" ) )
@@ -118,7 +118,7 @@ VFill::loadOasis( const TQDomElement &/*object*/, KoOasisLoadingContext &context
 			TQDomElement *grad = context.oasisStyles().drawStyles()[ style ];
 			kdDebug()<<" style gradient name :"<< grad <<endl;
 			if( grad )
-				m_gradient.loadOasis( *grad, stack, tqparent );
+				m_gradient.loadOasis( *grad, stack, parent );
 		}
 		if( stack.hasAttributeNS( KoXmlNS::draw, "opacity" ) )
 			m_color.setOpacity( stack.attributeNS( KoXmlNS::draw, "opacity" ).remove( '%' ).toFloat() / 100. );
@@ -161,7 +161,7 @@ VFill::operator=( const VFill& fill )
 {
 	if( this != &fill )
 	{
-		// dont copy the tqparent!
+		// dont copy the parent!
 		m_type = fill.m_type;
 		m_color = fill.m_color;
 		m_gradient = fill.m_gradient;
diff --git a/karbon/core/vfill.h b/karbon/core/vfill.h
index d05b8c88b..0e5629492 100644
--- a/karbon/core/vfill.h
+++ b/karbon/core/vfill.h
@@ -72,7 +72,7 @@ public:
 	void save( TQDomElement& element ) const;
 	void saveOasis( KoGenStyles &mainStyles, KoGenStyle &style ) const;
 	void load( const TQDomElement& element );
-	void loadOasis( const TQDomElement &object, KoOasisLoadingContext &context, VObject* tqparent = 0L );
+	void loadOasis( const TQDomElement &object, KoOasisLoadingContext &context, VObject* parent = 0L );
 
 	VFill& operator=( const VFill& fill );
 
diff --git a/karbon/core/vgradient.cc b/karbon/core/vgradient.cc
index 11d6239f2..60d892415 100644
--- a/karbon/core/vgradient.cc
+++ b/karbon/core/vgradient.cc
@@ -221,15 +221,15 @@ VGradient::saveOasis( KoGenStyles &mainStyles ) const
 }
 
 void
-VGradient::loadOasis( const TQDomElement &object, KoStyleStack &/*stack*/, VObject* tqparent )
+VGradient::loadOasis( const TQDomElement &object, KoStyleStack &/*stack*/, VObject* parent )
 {
 	kdDebug(38000) << "namespaceURI: " << object.namespaceURI() << endl;
 	kdDebug(38000) << "localName: " << object.localName() << endl;
 
 	KoRect bb;
 	
-	if( tqparent )
-		bb =  tqparent->boundingBox();
+	if( parent )
+		bb =  parent->boundingBox();
 
 	if( object.namespaceURI() == KoXmlNS::draw && object.localName() == "gradient" )
 	{
diff --git a/karbon/core/vgradient.h b/karbon/core/vgradient.h
index 8341eeabc..12b9d5526 100644
--- a/karbon/core/vgradient.h
+++ b/karbon/core/vgradient.h
@@ -109,7 +109,7 @@ public:
 	void save( TQDomElement& element ) const;
 	TQString saveOasis( KoGenStyles &mainStyles ) const;
 	void load( const TQDomElement& element );
-	void loadOasis( const TQDomElement &object, KoStyleStack &stack, VObject* tqparent = 0L );
+	void loadOasis( const TQDomElement &object, KoStyleStack &stack, VObject* parent = 0L );
 
 	void transform( const TQWMatrix& m );
 
diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc
index 35f3991ea..51d991e12 100644
--- a/karbon/core/vgroup.cc
+++ b/karbon/core/vgroup.cc
@@ -51,8 +51,8 @@
 #include <kdebug.h>
 
 
-VGroup::VGroup( VObject* tqparent, VState state )
-	: VObject( tqparent, state )
+VGroup::VGroup( VObject* parent, VState state )
+	: VObject( parent, state )
 {
 	m_stroke = new VStroke( this );
 	m_fill = new VFill();
diff --git a/karbon/core/vgroup.h b/karbon/core/vgroup.h
index 29eb38420..dbb3d3262 100644
--- a/karbon/core/vgroup.h
+++ b/karbon/core/vgroup.h
@@ -35,14 +35,14 @@ class KARBONBASE_EXPORT VGroup : public VObject
 {
 public:
 	/**
-	 * Constructs a new group object that is child of tqparent and has the given state.
+	 * Constructs a new group object that is child of parent and has the given state.
 	 *
 	 * The object's fill and stroke are created here.
 	 *
-	 * @param tqparent the new object's tqparent
+	 * @param parent the new object's parent
 	 * @param state the new object's state
 	 */
-	VGroup( VObject* tqparent, VState state = normal );
+	VGroup( VObject* parent, VState state = normal );
 
 	/**
 	 * Copy constructor.
diff --git a/karbon/core/vimage.cc b/karbon/core/vimage.cc
index 7f75254b8..4e8466613 100644
--- a/karbon/core/vimage.cc
+++ b/karbon/core/vimage.cc
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 
-VImage::VImage( VObject *tqparent, const TQString &fname ) : VObject( tqparent ), m_image( 0L ), m_fname( fname )
+VImage::VImage( VObject *parent, const TQString &fname ) : VObject( parent ), m_image( 0L ), m_fname( fname )
 {
 	m_stroke = new VStroke( this );
 	m_stroke->setType( VStroke::none );
diff --git a/karbon/core/vimage.h b/karbon/core/vimage.h
index 2933b4ebf..531c2bf52 100644
--- a/karbon/core/vimage.h
+++ b/karbon/core/vimage.h
@@ -14,7 +14,7 @@ class TQImage;
 class KARBONBASE_EXPORT VImage : public VObject
 {
 public:
-	VImage( VObject *tqparent, const TQString &fname = "" );
+	VImage( VObject *parent, const TQString &fname = "" );
 	VImage( const VImage & );
 	virtual ~VImage();
 
diff --git a/karbon/core/vkarbonplugin.cc b/karbon/core/vkarbonplugin.cc
index d05043d9c..41fd47a89 100644
--- a/karbon/core/vkarbonplugin.cc
+++ b/karbon/core/vkarbonplugin.cc
@@ -19,7 +19,7 @@
 
 #include "vkarbonplugin.h"
 
-VKarbonPlugin::VKarbonPlugin( TQObject *tqparent, const char* name ) : Plugin( tqparent, name )
+VKarbonPlugin::VKarbonPlugin( TQObject *parent, const char* name ) : Plugin( parent, name )
 {
 }
 
diff --git a/karbon/core/vkarbonplugin.h b/karbon/core/vkarbonplugin.h
index e86680a06..84fed9c6f 100644
--- a/karbon/core/vkarbonplugin.h
+++ b/karbon/core/vkarbonplugin.h
@@ -26,7 +26,7 @@
 class KARBONBASE_EXPORT VKarbonPlugin : public KParts::Plugin
 {
 public:
-	VKarbonPlugin( TQObject *tqparent, const char* name );
+	VKarbonPlugin( TQObject *parent, const char* name );
 	virtual ~VKarbonPlugin() {}
 };
 
diff --git a/karbon/core/vlayer.cc b/karbon/core/vlayer.cc
index dddfe6cec..47fe919d8 100644
--- a/karbon/core/vlayer.cc
+++ b/karbon/core/vlayer.cc
@@ -35,8 +35,8 @@
 #include "vfill.h"
 #include "vstroke.h"
 
-VLayer::VLayer( VObject* tqparent, VState state )
-	: VGroup( tqparent, state )
+VLayer::VLayer( VObject* parent, VState state )
+	: VGroup( parent, state )
 {
 	setName( "Layer" );
 	// HACK : vlayer just shouldn't have fill/stroke at all
diff --git a/karbon/core/vlayer.h b/karbon/core/vlayer.h
index 7dbd126ba..f52e7be4c 100644
--- a/karbon/core/vlayer.h
+++ b/karbon/core/vlayer.h
@@ -37,12 +37,12 @@ class KARBONBASE_EXPORT VLayer : public VGroup
 {
 public:
 	/**
-	 * Constructs a new layer object that is child of tqparent and has the given state.
+	 * Constructs a new layer object that is child of parent and has the given state.
 	 *
-	 * @param tqparent the new object's tqparent
+	 * @param parent the new object's parent
 	 * @param state the new object's state
 	 */
-	VLayer( VObject* tqparent, VState state = normal );
+	VLayer( VObject* parent, VState state = normal );
 
 	/**
 	 * Copy constructor.
diff --git a/karbon/core/vobject.cc b/karbon/core/vobject.cc
index 5e9f74b68..897652c37 100644
--- a/karbon/core/vobject.cc
+++ b/karbon/core/vobject.cc
@@ -33,12 +33,12 @@
 #include <KoOasisLoadingContext.h>
 #include <KoOasisStyles.h>
 
-VObject::VObject( VObject* tqparent, VState state ) : m_dcop( 0L )
+VObject::VObject( VObject* parent, VState state ) : m_dcop( 0L )
 {
 	m_stroke = 0L;
 	m_fill = 0L;
 	
-	m_parent = tqparent;
+	m_parent = parent;
 	m_state = state;
 
 	invalidateBoundingBox();
@@ -205,9 +205,9 @@ VObject::addStyles( const TQDomElement* style, KoOasisLoadingContext & context )
 {
 	if(style)
 	{
-		// this function is necessary as tqparent styles can have parents themself
-		if( style->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
-			addStyles( context.oasisStyles().findStyle( style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ) ), context );
+		// this function is necessary as parent styles can have parents themself
+		if( style->hasAttributeNS( KoXmlNS::style, "parent-style-name" ) )
+			addStyles( context.oasisStyles().findStyle( style->attributeNS( KoXmlNS::style, "parent-style-name", TQString() ) ), context );
 		context.addStyles( style, "style-name" );
 	}
 }
@@ -216,8 +216,8 @@ VDocument *
 VObject::document() const
 {
 	VObject *obj = (VObject *)this;
-	while( obj->tqparent() )
-		obj = obj->tqparent();
+	while( obj->parent() )
+		obj = obj->parent();
 	return dynamic_cast<VDocument *>( obj );
 }
 
diff --git a/karbon/core/vobject.h b/karbon/core/vobject.h
index 7cbbb0e93..899422ee1 100644
--- a/karbon/core/vobject.h
+++ b/karbon/core/vobject.h
@@ -44,7 +44,7 @@ class KoGenStyle;
  * have the ability to draw itself using a painter, perform
  * hit detection, transform on demand, clone and load/save itself.
  * Also each object manages its own bounding box and keeps track of its
- * tqparent object.
+ * parent object.
  */
 class KARBONBASE_EXPORT VObject
 {
@@ -63,16 +63,16 @@ public:
 	};
 
 	/**
-	 * Constructs a new object that is child of tqparent and has the given state.
+	 * Constructs a new object that is child of parent and has the given state.
 	 *
-	 * @param tqparent the new object's tqparent
+	 * @param parent the new object's parent
 	 * @param state the new object's state
 	 */
-	VObject( VObject* tqparent, VState state = edit );
+	VObject( VObject* parent, VState state = edit );
 	
 	/**
 	 * Copy constructor.
-	 * Copies tqparent, state and name of given object.
+	 * Copies parent, state and name of given object.
 	 *
 	 * @param obj the object to copy properties from
 	 */
@@ -133,18 +133,18 @@ public:
 	}
 
 	/**
-	 * Sets a new tqparent object.
+	 * Sets a new parent object.
 	 *
-	 * @param tqparent the new tqparent object
+	 * @param parent the new parent object
 	 */
-	void setParent( VObject* tqparent ) { m_parent = tqparent; }
+	void setParent( VObject* parent ) { m_parent = parent; }
 
 	/**
-	 * Returns pointer to current tqparent object.
+	 * Returns pointer to current parent object.
 	 *
-	 * @return pointer to current tqparent object or 0 if no tqparent object is set
+	 * @return pointer to current parent object or 0 if no parent object is set
 	 */
-	VObject* tqparent() const { return m_parent; }
+	VObject* parent() const { return m_parent; }
 
 	/**
 	 * Get the state the object is in.
@@ -266,7 +266,7 @@ public:
 	/**
 	 * Return document the object belongs to.
 	 *
-	 * @return pointer to tqparent document or 0 if object does not belong to a document
+	 * @return pointer to parent document or 0 if object does not belong to a document
 	 */
 	VDocument *document() const;
 
diff --git a/karbon/core/vobject_iface.cc b/karbon/core/vobject_iface.cc
index 09291ec4f..c93b68d60 100644
--- a/karbon/core/vobject_iface.cc
+++ b/karbon/core/vobject_iface.cc
@@ -41,11 +41,11 @@ VObjectIface::setState( int state )
 }
 
 DCOPRef
-VObjectIface::tqparent() const
+VObjectIface::parent() const
 {
-	if( !m_object->tqparent() )
+	if( !m_object->parent() )
 		return DCOPRef();
 
-	return DCOPRef( kapp->dcopClient()->appId(), m_object->tqparent()->dcopObject()->objId() );
+	return DCOPRef( kapp->dcopClient()->appId(), m_object->parent()->dcopObject()->objId() );
 }
 
diff --git a/karbon/core/vobject_iface.h b/karbon/core/vobject_iface.h
index e3a081d33..bbf2c6c57 100644
--- a/karbon/core/vobject_iface.h
+++ b/karbon/core/vobject_iface.h
@@ -45,9 +45,9 @@ k_dcop:
 
 	bool boundingBoxIsInvalid() const;
 	void invalidateBoundingBox();
-	void setParent( VObject* tqparent ) { m_parent = tqparent; }*/
+	void setParent( VObject* parent ) { m_parent = parent; }*/
 
-	DCOPRef tqparent() const;
+	DCOPRef parent() const;
 
 	int state() const;
 	void setState( int state );
diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc
index 1442d90c1..e5366966e 100644
--- a/karbon/core/vpath.cc
+++ b/karbon/core/vpath.cc
@@ -125,8 +125,8 @@ private:
 };
 
 
-VSubpath::VSubpath( VObject* tqparent )
-		: VObject( tqparent )
+VSubpath::VSubpath( VObject* parent )
+		: VObject( parent )
 {
 	m_isClosed = false;
 
@@ -654,7 +654,7 @@ VSubpath::revert()
 		return;
 
 
-	VSubpath list( tqparent() );
+	VSubpath list( parent() );
 	list.moveTo( getLast()->knot() );
 
 	VSegment* segment = getLast();
diff --git a/karbon/core/vpath.h b/karbon/core/vpath.h
index 48c89a4cd..7ed6f9bee 100644
--- a/karbon/core/vpath.h
+++ b/karbon/core/vpath.h
@@ -44,7 +44,7 @@ class KARBONBASE_EXPORT VSubpath : public VObject
 	friend class VSubpathIterator;
 
 public:
-	VSubpath( VObject* tqparent );
+	VSubpath( VObject* parent );
 	VSubpath( const VSubpath& list );
 	VSubpath( const VSegment& segment );
 	virtual ~VSubpath();
diff --git a/karbon/core/vselection.cc b/karbon/core/vselection.cc
index 77809ac50..5a10373f4 100644
--- a/karbon/core/vselection.cc
+++ b/karbon/core/vselection.cc
@@ -32,8 +32,8 @@
 
 uint VSelection::m_handleNodeSize = 3;
 
-VSelection::VSelection( VObject* tqparent )
-	: VObject( tqparent ), m_showhandle( true )
+VSelection::VSelection( VObject* parent )
+	: VObject( parent ), m_showhandle( true )
 {
 	m_handleRect = new KoRect[ 10 ];
 	setStroke( VStroke( VColor( TQt::black ) ) );
@@ -90,7 +90,7 @@ VSelection::take( const KoRect& rect, bool selectObjects, bool exclusive )
 	if( selectObjects )
 	{
 		VSelectObjects op( m_objects, rect, false );
-		if( op.visit( *static_cast<VDocument*>( tqparent() ) ) )
+		if( op.visit( *static_cast<VDocument*>( parent() ) ) )
 		{
 			selectNodes();
 			success = true;
@@ -123,7 +123,7 @@ VSelection::append()
 	clear();
 
 	VSelectObjects op( m_objects );
-	op.visit( *static_cast<VDocument*>( tqparent() ) );
+	op.visit( *static_cast<VDocument*>( parent() ) );
 	selectNodes();
 
 	invalidateBoundingBox();
@@ -159,7 +159,7 @@ VSelection::append( const KoRect& rect, bool selectObjects, bool exclusive )
 	{
 		//m_objects.clear();
 		VSelectObjects op( m_objects, rect );
-		if( op.visit( *static_cast<VDocument*>( tqparent() ) ) )
+		if( op.visit( *static_cast<VDocument*>( parent() ) ) )
 		{
 			selectNodes();
 			success = true;
diff --git a/karbon/core/vselection.h b/karbon/core/vselection.h
index c98e5bf1f..3db5d5391 100644
--- a/karbon/core/vselection.h
+++ b/karbon/core/vselection.h
@@ -62,11 +62,11 @@ class KARBONBASE_EXPORT VSelection : public VObject, public VVisitor
 {
 public:
 	/** 
-	 * Constructs a vselection with the specified tqparent.
+	 * Constructs a vselection with the specified parent.
 	 * 
-	 * @param tqparent the selection's tqparent
+	 * @param parent the selection's parent
 	 */
-	VSelection( VObject* tqparent = 0L );
+	VSelection( VObject* parent = 0L );
 
 	/**
 	 * Constructs a vselection by copying the specified selection.
diff --git a/karbon/core/vstroke.cc b/karbon/core/vstroke.cc
index 043f4e27d..0ec27fb28 100644
--- a/karbon/core/vstroke.cc
+++ b/karbon/core/vstroke.cc
@@ -33,10 +33,10 @@ VStroke::VStroke()
 : m_parent(0L), m_lineWidth(1.0), m_lineCap(capButt), m_lineJoin(joinMiter), m_miterLimit(10.0), m_type(none)
 {}
 
-VStroke::VStroke( VObject* tqparent, float width, const VLineCap cap, const VLineJoin join,
+VStroke::VStroke( VObject* parent, float width, const VLineCap cap, const VLineJoin join,
 			float miterLimit )
 {
-	m_parent = tqparent;
+	m_parent = parent;
 	m_type = solid;
 	m_lineWidth = width;
 	m_lineCap = cap;
@@ -44,10 +44,10 @@ VStroke::VStroke( VObject* tqparent, float width, const VLineCap cap, const VLin
 	m_miterLimit = miterLimit;
 }
 
-VStroke::VStroke( const VColor &c, VObject* tqparent, float width, const VLineCap cap, const VLineJoin join,
+VStroke::VStroke( const VColor &c, VObject* parent, float width, const VLineCap cap, const VLineJoin join,
 			float miterLimit )
 {
-	m_parent = tqparent;
+	m_parent = parent;
 	m_type = solid;
 	m_lineWidth = width;
 	m_lineCap = cap;
@@ -58,7 +58,7 @@ VStroke::VStroke( const VColor &c, VObject* tqparent, float width, const VLineCa
 
 VStroke::VStroke( const VStroke& stroke )
 {
-	// doesn't copy tqparent:
+	// doesn't copy parent:
 	*this = stroke;
 }
 
@@ -67,7 +67,7 @@ VStroke::setLineWidth( float width )
 {
 	m_lineWidth = width;
 
-	// tell our tqparent so he can update his bbox:
+	// tell our parent so he can update his bbox:
 	if( m_parent )
 		m_parent->invalidateBoundingBox();
 }
@@ -235,11 +235,11 @@ VStroke::operator=( const VStroke& stroke )
 {
 	if( this != &stroke )
 	{
-		// dont copy the tqparent!
+		// dont copy the parent!
 		m_type = stroke.m_type;
 
 		m_lineWidth = stroke.m_lineWidth;
-		// Tell our tqparent about the linewidth change, so he can update his bbox:
+		// Tell our parent about the linewidth change, so he can update his bbox:
 		//if( m_parent )
 		//	m_parent->invalidateBoundingBox();
 
diff --git a/karbon/core/vstroke.h b/karbon/core/vstroke.h
index 90eedc43a..5be1eaf49 100644
--- a/karbon/core/vstroke.h
+++ b/karbon/core/vstroke.h
@@ -72,14 +72,14 @@ public:
 	};
 
 	VStroke();
-	VStroke( VObject* tqparent, float width = 1.0, const VLineCap cap = capButt,
+	VStroke( VObject* parent, float width = 1.0, const VLineCap cap = capButt,
 			 const VLineJoin join = joinMiter, float miterLimit = 10.0 );
-	VStroke( const VColor &c, VObject* tqparent = 0L, float width = 1.0, const VLineCap cap = capButt,
+	VStroke( const VColor &c, VObject* parent = 0L, float width = 1.0, const VLineCap cap = capButt,
 			 const VLineJoin join = joinMiter, float miterLimit = 10.0 );
 	VStroke( const VStroke& stroke );
 
-	void setParent( VObject* tqparent ) { m_parent = tqparent; }
-	VObject* tqparent()const { return m_parent; }
+	void setParent( VObject* parent ) { m_parent = parent; }
+	VObject* parent()const { return m_parent; }
 
 	VStrokeType type() const { return m_type; }
 	void setType( VStrokeType type ) { m_type = type; }
diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc
index e73445ee4..c45d91cb3 100644
--- a/karbon/core/vtext.cc
+++ b/karbon/core/vtext.cc
@@ -120,8 +120,8 @@ FT_Outline_Funcs OutlineMethods =
 
 #endif // HAVE_KARBONTEXT
 
-VText::VText( VObject* tqparent, VState state )
-	: VObject( tqparent, state ), m_basePath( 0L )
+VText::VText( VObject* parent, VState state )
+	: VObject( parent, state ), m_basePath( 0L )
 {
 	m_glyphs.setAutoDelete( true );
 	m_boundingBoxIsInvalid = true;
@@ -287,7 +287,7 @@ VText::clone() const
 
 VGroup* VText::toVGroup() const
 {
-	VGroup* group = new VGroup( tqparent() );
+	VGroup* group = new VGroup( parent() );
 
 	VPathListIterator itr( m_glyphs );
 	for( itr.toFirst(); itr.current(); ++itr )
diff --git a/karbon/core/vtext.h b/karbon/core/vtext.h
index 55455c5f1..ef40ac28d 100644
--- a/karbon/core/vtext.h
+++ b/karbon/core/vtext.h
@@ -56,7 +56,7 @@ public:
 		Right
 	};
 
-	VText( VObject* tqparent, VState state = normal );
+	VText( VObject* parent, VState state = normal );
 	VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment tqalignment, const TQString& text );
 	VText( const VText& text );
 	virtual ~VText();
diff --git a/karbon/dialogs/vcolordlg.cc b/karbon/dialogs/vcolordlg.cc
index b12d983bc..90548045a 100644
--- a/karbon/dialogs/vcolordlg.cc
+++ b/karbon/dialogs/vcolordlg.cc
@@ -24,8 +24,8 @@
 #include "vcolordlg.h"
 #include "vcolortab.h"
 
-VColorDlg::VColorDlg( const VColor &c, TQWidget* tqparent, const char* name )
-	: KDialogBase ( tqparent, name, true, i18n( "Uniform Color" ),
+VColorDlg::VColorDlg( const VColor &c, TQWidget* parent, const char* name )
+	: KDialogBase ( parent, name, true, i18n( "Uniform Color" ),
 		KDialogBase::Ok | KDialogBase::Cancel )
 {
 	m_colortab = new VColorTab( VColor( c ), this, name );
diff --git a/karbon/dialogs/vcolordlg.h b/karbon/dialogs/vcolordlg.h
index 92fc08579..97e53d272 100644
--- a/karbon/dialogs/vcolordlg.h
+++ b/karbon/dialogs/vcolordlg.h
@@ -33,7 +33,7 @@ class VColorDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VColorDlg( const VColor &c, TQWidget* tqparent = 0L, const char* name = 0L );
+	VColorDlg( const VColor &c, TQWidget* parent = 0L, const char* name = 0L );
 
 	VColor Color();
 
diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cc
index f66a9cedd..56fecc0b9 100644
--- a/karbon/dialogs/vcolortab.cc
+++ b/karbon/dialogs/vcolortab.cc
@@ -34,8 +34,8 @@
 #include <kdebug.h>
 
 
-VColorTab::VColorTab( const VColor &c, TQWidget* tqparent, const char* name )
-	: TQTabWidget( tqparent, name )
+VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name )
+	: TQTabWidget( parent, name )
 {
 	TQGridLayout *mainLayout;
 
diff --git a/karbon/dialogs/vcolortab.h b/karbon/dialogs/vcolortab.h
index 5397cdb8c..c705b6750 100644
--- a/karbon/dialogs/vcolortab.h
+++ b/karbon/dialogs/vcolortab.h
@@ -37,7 +37,7 @@ class VColorTab : public TQTabWidget
   TQ_OBJECT
 
 public:
-	VColorTab( const VColor &c, TQWidget* tqparent = 0L, const char* name = 0L );
+	VColorTab( const VColor &c, TQWidget* parent = 0L, const char* name = 0L );
 
 	VColor Color();
 
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index ba86b3131..141006dcc 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -43,29 +43,29 @@
 #include "vconfiguredlg.h"
 
 
-VConfigureDlg::VConfigureDlg( KarbonView* tqparent )
+VConfigureDlg::VConfigureDlg( KarbonView* parent )
 		: KDialogBase( KDialogBase::IconList, i18n( "Configure" ),
 					   KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Default,
-					   KDialogBase::Ok, tqparent )
+					   KDialogBase::Ok, parent )
 
 {
 	TQVBox * page = addVBoxPage(
 					   i18n( "Interface" ), i18n( "Interface" ),
 					   BarIcon( "misc", KIcon::SizeMedium ) );
 
-	m_interfacePage = new VConfigInterfacePage( tqparent, page );
+	m_interfacePage = new VConfigInterfacePage( parent, page );
 
 	page = addVBoxPage(
 			   i18n( "Misc" ), i18n( "Misc" ),
 			   BarIcon( "misc", KIcon::SizeMedium ) );
 
-	m_miscPage = new VConfigMiscPage( tqparent, page );
+	m_miscPage = new VConfigMiscPage( parent, page );
 
 	page = addVBoxPage(
 			   i18n( "Grid" ), i18n( "Grid" ),
 			   BarIcon( "grid", KIcon::SizeMedium ) );
 
-	m_gridPage = new VConfigGridPage( tqparent, page );
+	m_gridPage = new VConfigGridPage( parent, page );
 
 	connect( m_miscPage, TQT_SIGNAL( unitChanged( int ) ), m_gridPage, TQT_SLOT( slotUnitChanged( int ) ) );
 
@@ -73,7 +73,7 @@ VConfigureDlg::VConfigureDlg( KarbonView* tqparent )
 			   i18n( "Document" ), i18n( "Document Settings" ),
 			   BarIcon( "document", KIcon::SizeMedium ) );
 
-	m_defaultDocPage = new VConfigDefaultPage( tqparent, page );
+	m_defaultDocPage = new VConfigDefaultPage( parent, page );
 	connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) );
 }
 
@@ -105,7 +105,7 @@ void VConfigureDlg::slotDefault()
 
 VConfigInterfacePage::VConfigInterfacePage( KarbonView* view,
 		TQVBox* box, char* name )
-		: TQObject( box->tqparent(), name )
+		: TQObject( box->parent(), name )
 {
 	m_view = view;
 	m_config = KarbonFactory::instance()->config();
@@ -210,7 +210,7 @@ void VConfigInterfacePage::slotDefault()
 
 
 VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name )
-		: TQObject( box->tqparent(), name )
+		: TQObject( box->parent(), name )
 {
     m_view = view;
     m_config = KarbonFactory::instance()->config();
@@ -283,7 +283,7 @@ void VConfigMiscPage::slotDefault()
 }
 
 VConfigGridPage::VConfigGridPage( KarbonView* view, TQVBox* page, char* name )
-		: TQObject( page->tqparent(), name )
+		: TQObject( page->parent(), name )
 {
 	m_view = view;
 	KoUnit::Unit unit = view->part()->document().unit();
@@ -378,7 +378,7 @@ void VConfigGridPage::slotDefault()
 
 VConfigDefaultPage::VConfigDefaultPage( KarbonView* view,
                                         TQVBox* box, char* name )
-    : TQObject( box->tqparent(), name )
+    : TQObject( box->parent(), name )
 {
     m_view = view;
 
diff --git a/karbon/dialogs/vconfiguredlg.h b/karbon/dialogs/vconfiguredlg.h
index dd12eba2d..2ba989de5 100644
--- a/karbon/dialogs/vconfiguredlg.h
+++ b/karbon/dialogs/vconfiguredlg.h
@@ -151,7 +151,7 @@ class VConfigureDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VConfigureDlg( KarbonView* tqparent );
+	VConfigureDlg( KarbonView* parent );
 
 public slots:
 	void slotApply();
diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cc
index 8dcfa9f90..2428de118 100644
--- a/karbon/dialogs/vstrokedlg.cc
+++ b/karbon/dialogs/vstrokedlg.cc
@@ -39,8 +39,8 @@
 #include "vstrokedlg.h"
 #include "vcolortab.h"
 
-VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* tqparent, const char* name )
-	: KDialogBase ( tqparent, name, true, i18n( "Stroke" ), Ok | Cancel ), m_part( part )
+VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name )
+	: KDialogBase ( parent, name, true, i18n( "Stroke" ), Ok | Cancel ), m_part( part )
 {
 	enableButtonSeparator( true );
 	TQTabWidget *mainWidget = new TQTabWidget( this, "strokemain" );
diff --git a/karbon/dialogs/vstrokedlg.h b/karbon/dialogs/vstrokedlg.h
index a75a87271..eab40610a 100644
--- a/karbon/dialogs/vstrokedlg.h
+++ b/karbon/dialogs/vstrokedlg.h
@@ -37,7 +37,7 @@ class VStrokeDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VStrokeDlg( KarbonPart* part, TQWidget* tqparent = 0L, const char* name = 0L );
+	VStrokeDlg( KarbonPart* part, TQWidget* parent = 0L, const char* name = 0L );
 
 private:
 	VColorTab* m_colortab;
diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc
index 0babda008..c6453575f 100644
--- a/karbon/dockers/vcolordocker.cc
+++ b/karbon/dockers/vcolordocker.cc
@@ -51,8 +51,8 @@
 
 #include <kdebug.h>
 
-VColorDocker::VColorDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VColorDocker::VColorDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	m_isStrokeDocker = false;
 	setCaption( i18n( "Color Chooser" ) );
diff --git a/karbon/dockers/vcolordocker.h b/karbon/dockers/vcolordocker.h
index ea8e4c9d9..a973d7c6e 100644
--- a/karbon/dockers/vcolordocker.h
+++ b/karbon/dockers/vcolordocker.h
@@ -37,7 +37,7 @@ class VColorDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	 VColorDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	 VColorDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 	 virtual ~VColorDocker();
 
 	 virtual bool isStrokeDocker() { return m_isStrokeDocker; };
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 23e4243c1..98b0b8839 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -61,8 +61,8 @@ static long g_lastKey = 0;
  *  Document tab                                                         *
  *************************************************************************/
 
-VDocumentPreview::VDocumentPreview( KarbonView* view, TQWidget* tqparent )
-		: TQWidget( tqparent, "DocumentPreview" ), m_document( &view->part()->document() ), m_view( view )
+VDocumentPreview::VDocumentPreview( KarbonView* view, TQWidget* parent )
+		: TQWidget( parent, "DocumentPreview" ), m_document( &view->part()->document() ), m_view( view )
 {
 	update();
 	installEventFilter( this );
@@ -220,8 +220,8 @@ VDocumentPreview::paintEvent( TQPaintEvent* )
 	bitBlt( this, 0, 0, &pixmap, 0, 0, width(), height() );
 } // VDocumentPreview::paintEvent
 
-VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* tqparent )
-		: TQWidget( tqparent, "DocumentTab" ), m_view( view )
+VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent )
+		: TQWidget( parent, "DocumentTab" ), m_view( view )
 {
 	TQFrame* frame;
 	TQGridLayout* tqlayout = new TQGridLayout( this );
@@ -303,8 +303,8 @@ VDocumentTab::slotCommandExecuted()
  *  Layers tab                                                           *
  *************************************************************************/
 
-VObjectListViewItem::VObjectListViewItem( TQListViewItem* tqparent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map )
-	: TQListViewItem( tqparent, 0L ), m_object( object ), m_document( doc ), m_key( key ), m_map( map )
+VObjectListViewItem::VObjectListViewItem( TQListViewItem* parent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map )
+	: TQListViewItem( parent, 0L ), m_object( object ), m_document( doc ), m_key( key ), m_map( map )
 {
 	update();
 	// add itself to object list item map
@@ -370,8 +370,8 @@ VObjectListViewItem::compare( TQListViewItem *i, int /*col*/, bool /*ascending*/
 	return m_key < objectItem->m_key ? -1 : 1;
 }
 
-VLayerListViewItem::VLayerListViewItem( TQListView* tqparent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map )
-	: TQCheckListItem( tqparent, 0L, CheckBox ), m_layer( layer ), m_document( doc), m_map( map )
+VLayerListViewItem::VLayerListViewItem( TQListView* parent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map )
+	: TQCheckListItem( parent, 0L, CheckBox ), m_layer( layer ), m_document( doc), m_map( map )
 {
 	update();
 	// add itself to layer list item map
@@ -449,8 +449,8 @@ VLayerListViewItem::compare( TQListViewItem *i, int /*col*/, bool /*ascending*/
 	return m_key < layerItem->m_key ? -1 : 1;
 }
 
-VLayersTab::VLayersTab( KarbonView* view, TQWidget* tqparent )
-		: TQWidget( tqparent, "LayersTab" ), m_view( view ), m_document( &view->part()->document() )
+VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent )
+		: TQWidget( parent, "LayersTab" ), m_view( view ), m_document( &view->part()->document() )
 {
 
 	TQToolButton* button;
@@ -584,12 +584,12 @@ VLayersTab::selectionChangedFromTool()
 			VObjectListViewItem *item = m_objects[ obj ];
 			if( ! item ) 
 			{
-				VLayerListViewItem *layerItem = m_layers[ obj->tqparent() ];
+				VLayerListViewItem *layerItem = m_layers[ obj->parent() ];
 				if( layerItem )
 					updateObjects( layerItem->layer(), layerItem );
 				else
 				{
-					VObjectListViewItem *objectItem = m_objects[ obj->tqparent() ];
+					VObjectListViewItem *objectItem = m_objects[ obj->parent() ];
 					if( objectItem )
 						updateObjects( objectItem->object(), objectItem );
 					else
@@ -982,10 +982,10 @@ VLayersTab::updateObjects( VObject *object, TQListViewItem *item )
 				objectItem = new VObjectListViewItem( item, itr.current(), m_document, objcount, &m_objects );
 				objectItem->update();
 			}
-			else if( objectItem->tqparent() != item )
+			else if( objectItem->parent() != item )
 			{
-				// object found, but has false tqparent -> reparent
-				objectItem->tqparent()->takeItem( objectItem );
+				// object found, but has false parent -> reparent
+				objectItem->parent()->takeItem( objectItem );
 				item->insertItem( objectItem );
 			}
 
@@ -1009,11 +1009,11 @@ VLayersTab::removeDeletedObjectsFromList()
 	// BEWARE: when deleting an item, the iterator is automatically incremented
 	for(; it.current(); )
 	{
-		VLayerListViewItem *layerItem = dynamic_cast<VLayerListViewItem*>( it.current()->tqparent() );
+		VLayerListViewItem *layerItem = dynamic_cast<VLayerListViewItem*>( it.current()->parent() );
 		if( layerItem )
 		{
 			VGroup *group = dynamic_cast<VGroup*>( layerItem->layer() );
-			// check if object of item is still child of object of tqparent item
+			// check if object of item is still child of object of parent item
 			if( group && ! group->objects().contains( it.current()->object() ) )
 			{
 				layerItem->takeItem( it.current() );
@@ -1023,11 +1023,11 @@ VLayersTab::removeDeletedObjectsFromList()
 		}
 		else
 		{
-			VObjectListViewItem *objectItem = dynamic_cast<VObjectListViewItem*>( it.current()->tqparent() );
+			VObjectListViewItem *objectItem = dynamic_cast<VObjectListViewItem*>( it.current()->parent() );
 			if( objectItem ) 
 			{
 				VGroup *group = dynamic_cast<VGroup*>( objectItem->object() );
-				// check if object of item is still child of object of tqparent item
+				// check if object of item is still child of object of parent item
 				if( group && ! group->objects().contains( it.current()->object() ) )
 				{
 					objectItem->takeItem( it.current() );
@@ -1085,12 +1085,12 @@ VLayersTab::slotCommandExecuted( VCommand* command )
  *  History tab                                                          *
  *************************************************************************/
 
-VHistoryGroupItem::VHistoryGroupItem( VHistoryItem* item, TQListView* tqparent, TQListViewItem* after )
-		: TQListViewItem( tqparent, after )
+VHistoryGroupItem::VHistoryGroupItem( VHistoryItem* item, TQListView* parent, TQListViewItem* after )
+		: TQListViewItem( parent, after )
 {
 	setPixmap( 0, *item->pixmap( 0 ) );
 	setText( 0, item->text( 0 ) );
-	tqparent->takeItem( item );
+	parent->takeItem( item );
 	insertItem( item );
 	m_key = item->key( 0, true );
 } // VHistoryItem::VHistoryItem
@@ -1145,14 +1145,14 @@ VHistoryGroupItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& )
 
 } // VHistoryGroupItem::paintFocus
 
-VHistoryItem::VHistoryItem( VCommand* command, TQListView* tqparent, TQListViewItem* after )
-		: TQListViewItem( tqparent, after ), m_command( command )
+VHistoryItem::VHistoryItem( VCommand* command, TQListView* parent, TQListViewItem* after )
+		: TQListViewItem( parent, after ), m_command( command )
 {
 	init();
 } // VHistoryItem::VHistoryItem
 
-VHistoryItem::VHistoryItem( VCommand* command, VHistoryGroupItem* tqparent, TQListViewItem* after )
-		: TQListViewItem( tqparent, after ), m_command( command )
+VHistoryItem::VHistoryItem( VCommand* command, VHistoryGroupItem* parent, TQListViewItem* after )
+		: TQListViewItem( parent, after ), m_command( command )
 {
 	init();
 } // VHistoryItem::VHistoryItem
@@ -1200,8 +1200,8 @@ VHistoryItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& )
 
 } // VHistoryItem::paintFocus
 
-VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* tqparent )
-		: TQWidget( tqparent ), m_part( part )
+VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent )
+		: TQWidget( parent ), m_part( part )
 {
 	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
 	tqlayout->setMargin( 3 );
@@ -1298,8 +1298,8 @@ VHistoryTab::commandExecuted( VCommand* command )
 	if ( found )
 	{
 		m_history->repaintItem( item );
-		if ( item->tqparent() )
-			m_history->repaintItem( item->tqparent() );
+		if ( item->parent() )
+			m_history->repaintItem( item->parent() );
 		m_history->ensureItemVisible( item );
 	}
 } // VHistoryTab::commandExecuted
diff --git a/karbon/dockers/vdocumentdocker.h b/karbon/dockers/vdocumentdocker.h
index 4f60949a7..f88bdf7f9 100644
--- a/karbon/dockers/vdocumentdocker.h
+++ b/karbon/dockers/vdocumentdocker.h
@@ -43,7 +43,7 @@ class VDocumentPreview : public TQWidget
   TQ_OBJECT
 
 	public:
-		VDocumentPreview( KarbonView* view, TQWidget* tqparent = 0 );
+		VDocumentPreview( KarbonView* view, TQWidget* parent = 0 );
 		~VDocumentPreview();
 
 		void reset();
@@ -67,7 +67,7 @@ class VDocumentTab : public TQWidget
   TQ_OBJECT
 
 	public:
-		VDocumentTab( KarbonView* view, TQWidget* tqparent );
+		VDocumentTab( KarbonView* view, TQWidget* parent );
 		~VDocumentTab();
 
 	public slots:
@@ -94,7 +94,7 @@ class VDocumentTab : public TQWidget
 class VLayerListViewItem : public TQCheckListItem
 {
 public:
-	VLayerListViewItem( TQListView* tqparent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map );
+	VLayerListViewItem( TQListView* parent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map );
 	virtual ~VLayerListViewItem();
 
 	VLayer* layer() { return m_layer; }
@@ -117,7 +117,7 @@ private:
 class VObjectListViewItem : public TQListViewItem
 {
 public:
-	VObjectListViewItem( TQListViewItem* tqparent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map );
+	VObjectListViewItem( TQListViewItem* parent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map );
 	virtual ~VObjectListViewItem();
 
 	VObject* object() { return m_object; }
@@ -138,7 +138,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	VLayersTab( KarbonView* view, TQWidget* tqparent = 0 );
+	VLayersTab( KarbonView* view, TQWidget* parent = 0 );
 	~VLayersTab();
 
 public slots:
@@ -185,7 +185,7 @@ class VHistoryItem;
 class VHistoryGroupItem : public TQListViewItem
 {
 	public:
-		VHistoryGroupItem( VHistoryItem* item, TQListView* tqparent, TQListViewItem* after );
+		VHistoryGroupItem( VHistoryItem* item, TQListView* parent, TQListViewItem* after );
 		~VHistoryGroupItem();
 
 		void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align );
@@ -201,8 +201,8 @@ class VHistoryGroupItem : public TQListViewItem
 class VHistoryItem : public TQListViewItem
 {
 	public:
-		VHistoryItem( VCommand* command, TQListView* tqparent, TQListViewItem* after );
-		VHistoryItem( VCommand* command, VHistoryGroupItem* tqparent, TQListViewItem* after );
+		VHistoryItem( VCommand* command, TQListView* parent, TQListViewItem* after );
+		VHistoryItem( VCommand* command, VHistoryGroupItem* parent, TQListViewItem* after );
 		~VHistoryItem();
 
 		VCommand* command() { return m_command; }
@@ -226,7 +226,7 @@ class VHistoryTab : public TQWidget
   TQ_OBJECT
 
 	public:
-		VHistoryTab( KarbonPart* part, TQWidget* tqparent );
+		VHistoryTab( KarbonPart* part, TQWidget* parent );
 		~VHistoryTab();
 
 		bool groupingEnabled();
diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cc
index fb3dce28f..f30b30424 100644
--- a/karbon/dockers/vstrokedocker.cc
+++ b/karbon/dockers/vstrokedocker.cc
@@ -39,8 +39,8 @@
 
 #include "vstrokedocker.h"
 
-VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	setCaption( i18n( "Stroke Properties" ) );
 
diff --git a/karbon/dockers/vstrokedocker.h b/karbon/dockers/vstrokedocker.h
index 742387a75..a470619aa 100644
--- a/karbon/dockers/vstrokedocker.h
+++ b/karbon/dockers/vstrokedocker.h
@@ -36,7 +36,7 @@ class VStrokeDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	 VStrokeDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	 VStrokeDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 
 public slots:
 	virtual void setStroke( const VStroke & );
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index fcf317f65..5b7633b15 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -46,8 +46,8 @@
 
 #include <unistd.h>
 
-ClipartChooser::ClipartChooser( TQSize iconSize, TQWidget *tqparent, const char *name )
-	: KoIconChooser( iconSize, tqparent, name )
+ClipartChooser::ClipartChooser( TQSize iconSize, TQWidget *parent, const char *name )
+	: KoIconChooser( iconSize, parent, name )
 {
 	setDragEnabled( true );
 }
@@ -72,8 +72,8 @@ ClipartChooser::startDrag()
 	kd->dragCopy();
 }
 
-VStyleDocker::VStyleDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VStyleDocker::VStyleDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	setCaption( i18n( "Resources" ) );
 
@@ -123,8 +123,8 @@ VStyleDocker::mouseReleaseEvent( TQMouseEvent * )
 {
 }
 
-ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* tqparent )
-	: TQWidget( tqparent ), m_part( part )
+ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* parent )
+	: TQWidget( parent ), m_part( part )
 {
 	KIconLoader il;
 
diff --git a/karbon/dockers/vstyledocker.h b/karbon/dockers/vstyledocker.h
index 026a7d979..f994d53e7 100644
--- a/karbon/dockers/vstyledocker.h
+++ b/karbon/dockers/vstyledocker.h
@@ -35,7 +35,7 @@ class VClipartIconItem;
 class ClipartChooser : public KoIconChooser
 {
 public:
-	ClipartChooser( TQSize iconSize, TQWidget *tqparent = 0L, const char *name = 0L );
+	ClipartChooser( TQSize iconSize, TQWidget *parent = 0L, const char *name = 0L );
 	virtual void startDrag();
 };
 
@@ -45,7 +45,7 @@ class ClipartWidget : public TQWidget
   TQ_OBJECT
 
 public:
-	ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* tqparent = 0L );
+	ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* parent = 0L );
 	~ClipartWidget();
 
 	VClipartIconItem* selectedClipart();
@@ -74,7 +74,7 @@ class VStyleDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	 VStyleDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	 VStyleDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 	 virtual ~VStyleDocker();
 
 public slots:
diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc
index 76c91de6d..7e93577b2 100644
--- a/karbon/dockers/vtransformdocker.cc
+++ b/karbon/dockers/vtransformdocker.cc
@@ -37,8 +37,8 @@
 
 #include "vtransformdocker.h"
 
-VTransformDocker::VTransformDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VTransformDocker::VTransformDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	setCaption( i18n( "Transform" ) );
 
diff --git a/karbon/dockers/vtransformdocker.h b/karbon/dockers/vtransformdocker.h
index 8e2f21e8f..712b86f41 100644
--- a/karbon/dockers/vtransformdocker.h
+++ b/karbon/dockers/vtransformdocker.h
@@ -31,7 +31,7 @@ class VTransformDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	VTransformDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	VTransformDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 
 public slots:
 	void update();
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index 041de7ffe..1d267e1b9 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -41,8 +41,8 @@ KarbonResourceServer* KarbonFactory::s_rserver = 0;
 KInstance* KarbonFactory::s_instance = 0L;
 KAboutData* KarbonFactory::s_aboutData = 0L;
 
-KarbonFactory::KarbonFactory( TQObject* tqparent, const char* name )
-		: KoFactory( tqparent, name )
+KarbonFactory::KarbonFactory( TQObject* parent, const char* name )
+		: KoFactory( parent, name )
 {
 	instance();
 
@@ -77,7 +77,7 @@ KarbonFactory::~KarbonFactory()
 
 KParts::Part*
 KarbonFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
-								 TQObject* tqparent, const char* name, const char* classname, const TQStringList& )
+								 TQObject* parent, const char* name, const char* classname, const TQStringList& )
 {
 	// If classname is "KoDocument", our host is a koffice application
 	// otherwise, the host wants us as a simple part, so switch to readonly and
@@ -87,7 +87,7 @@ KarbonFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
 	// parentWidget and widgetName are used by KoDocument for the
 	// "readonly+singleView" case.
 	KarbonPart* part =
-		new KarbonPart( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
+		new KarbonPart( parentWidget, widgetName, parent, name, !bWantKoDocument );
 
 	if( !bWantKoDocument )
 		part->setReadWrite( false );
diff --git a/karbon/karbon_factory.h b/karbon/karbon_factory.h
index 436faa2ce..db0351f63 100644
--- a/karbon/karbon_factory.h
+++ b/karbon/karbon_factory.h
@@ -34,11 +34,11 @@ class KARBONCOMMON_EXPORT KarbonFactory : public KoFactory
   TQ_OBJECT
 
 public:
-	KarbonFactory( TQObject* tqparent = 0, const char* name = 0 );
+	KarbonFactory( TQObject* parent = 0, const char* name = 0 );
 	~KarbonFactory();
 
 	virtual KParts::Part* createPartObject( TQWidget *parentWidget = 0,
-											const char* widgetName = 0L, TQObject* tqparent = 0L, const char* name = 0L,
+											const char* widgetName = 0L, TQObject* parent = 0L, const char* name = 0L,
 											const char* classname = "KoDocument", const TQStringList& args = TQStringList() );
 
 	static KInstance* instance();
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 7aa145d31..64dafd6a2 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -58,8 +58,8 @@
 // static const char * CURRENT_DTD_VERSION = "1.2";
 
 KarbonPart::KarbonPart( TQWidget* parentWidget, const char* widgetName,
-						TQObject* tqparent, const char* name, bool singleViewMode )
-		: KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
+						TQObject* parent, const char* name, bool singleViewMode )
+		: KoDocument( parentWidget, widgetName, parent, name, singleViewMode )
 {
 	setInstance( KarbonFactory::instance(), false );
 	setTemplateType( "karbon_template" );
@@ -158,9 +158,9 @@ KarbonPart::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 }
 
 KoView*
-KarbonPart::createViewInstance( TQWidget* tqparent, const char* name )
+KarbonPart::createViewInstance( TQWidget* parent, const char* name )
 {
-	KarbonView *result = new KarbonView( this, tqparent, name );
+	KarbonView *result = new KarbonView( this, parent, name );
 	return result;
 }
 
diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h
index 762f9985f..34e0e04b1 100644
--- a/karbon/karbon_part.h
+++ b/karbon/karbon_part.h
@@ -48,7 +48,7 @@ class KARBONCOMMON_EXPORT KarbonPart : public KoDocument
   TQ_OBJECT
 public:
 	KarbonPart( TQWidget* parentWidget = 0L, const char* widgetName = 0L,
-				TQObject* tqparent = 0L, const char* name = 0L, bool singleViewMode = false );
+				TQObject* parent = 0L, const char* name = 0L, bool singleViewMode = false );
 	virtual ~KarbonPart();
 
 	virtual void paintContent( TQPainter& painter, const TQRect& rect,
@@ -115,7 +115,7 @@ public slots:
 	void slotUnitChanged( KoUnit::Unit unit );
 
 protected:
-	virtual KoView* createViewInstance( TQWidget* tqparent, const char* name );
+	virtual KoView* createViewInstance( TQWidget* parent, const char* name );
 	virtual void removeView( KoView *view );
 	void saveOasisSettings( KoXmlWriter &/*settingsWriter*/ );
 	void loadOasisSettings( const TQDomDocument&settingsDoc );
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc
index 83db0edca..f099fad06 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -107,8 +107,8 @@
 const int rulerWidth = 20;  // vertical ruler width
 const int rulerHeight = 20; // horizontal ruler height
 
-KarbonView::KarbonView( KarbonPart* p, TQWidget* tqparent, const char* name )
-		: KoView( p, tqparent, name ), KXMLGUIBuilder( shell() ), m_part( p )
+KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name )
+		: KoView( p, parent, name ), KXMLGUIBuilder( shell() ), m_part( p )
 {
 	m_toolbox = 0L;
 	m_toolController = new VToolController( this );
@@ -249,7 +249,7 @@ static TQt::Dock stringToDock( const TQString& attrPosition )
 }
 
 TQWidget *
-KarbonView::createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id )
+KarbonView::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id )
 {
 	if( element.attribute( "name" ) == "Tools" )
 	{
@@ -291,11 +291,11 @@ KarbonView::createContainer( TQWidget *tqparent, int index, const TQDomElement &
 		}
 	}
 
-	return KXMLGUIBuilder::createContainer( tqparent, index, element, id );
+	return KXMLGUIBuilder::createContainer( parent, index, element, id );
 }
 
 void
-KarbonView::removeContainer( TQWidget *container, TQWidget *tqparent,
+KarbonView::removeContainer( TQWidget *container, TQWidget *parent,
 							 TQDomElement &element, int id )
 {
 	if( container )
@@ -318,7 +318,7 @@ KarbonView::removeContainer( TQWidget *container, TQWidget *tqparent,
 // 		m_selectToolBar = 0L;
 	}
 	else
-		KXMLGUIBuilder::removeContainer( container, tqparent, element, id );
+		KXMLGUIBuilder::removeContainer( container, parent, element, id );
 }
 
 
diff --git a/karbon/karbon_view.h b/karbon/karbon_view.h
index 3e232d5f0..13afd9f16 100644
--- a/karbon/karbon_view.h
+++ b/karbon/karbon_view.h
@@ -77,7 +77,7 @@ class KARBONCOMMON_EXPORT KarbonView : public KoView, public KXMLGUIBuilder
   TQ_OBJECT
 
 public:
-	KarbonView( KarbonPart* part, TQWidget* tqparent = 0L,
+	KarbonView( KarbonPart* part, TQWidget* parent = 0L,
 				const char* name = 0L );
 	virtual ~KarbonView();
 
@@ -221,8 +221,8 @@ protected:
 	void createResourceDock();
 
 	//KXMLGUIBuilder
-	virtual TQWidget *createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id );
-	virtual void removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id );
+	virtual TQWidget *createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id );
+	virtual void removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id );
 	void addSelectionToClipboard() const;
 
 private:
diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cc b/karbon/plugins/flattenpath/flattenpathplugin.cc
index eff3cebdb..aa5fb3cc5 100644
--- a/karbon/plugins/flattenpath/flattenpathplugin.cc
+++ b/karbon/plugins/flattenpath/flattenpathplugin.cc
@@ -33,8 +33,8 @@
 typedef KGenericFactory<FlattenPathPlugin, KarbonView> FlattenPathPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_flattenpathplugin, FlattenPathPluginFactory( "karbonflattenpathplugin" ) )
 
-FlattenPathPlugin::FlattenPathPlugin( KarbonView *tqparent, const char* name, const TQStringList & )
-: Plugin( TQT_TQOBJECT(tqparent), name )
+FlattenPathPlugin::FlattenPathPlugin( KarbonView *parent, const char* name, const TQStringList & )
+: Plugin( TQT_TQOBJECT(parent), name )
 {
 	new KAction(
 		i18n( "&Flatten Path..." ), "14_flatten", 0, this,
@@ -47,13 +47,13 @@ FlattenPathPlugin::FlattenPathPlugin( KarbonView *tqparent, const char* name, co
 void
 FlattenPathPlugin::slotFlattenPath()
 {
-	KarbonPart *part = ((KarbonView *)tqparent())->part();
+	KarbonPart *part = ((KarbonView *)parent())->part();
 	if( part && m_flattenPathDlg->exec() )
 		part->addCommand( new VFlattenCmd( &part->document(), m_flattenPathDlg->flatness() ), true );
 }
 
-VFlattenDlg::VFlattenDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true,  i18n( "Flatten Path" ), Ok | Cancel )
+VFlattenDlg::VFlattenDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true,  i18n( "Flatten Path" ), Ok | Cancel )
 {
 	// add input fields on the left:
 	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
diff --git a/karbon/plugins/flattenpath/flattenpathplugin.h b/karbon/plugins/flattenpath/flattenpathplugin.h
index d4a4e3a7f..9837f688d 100644
--- a/karbon/plugins/flattenpath/flattenpathplugin.h
+++ b/karbon/plugins/flattenpath/flattenpathplugin.h
@@ -31,7 +31,7 @@ class FlattenPathPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	FlattenPathPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
+	FlattenPathPlugin( KarbonView *parent, const char* name, const TQStringList & );
 	virtual ~FlattenPathPlugin() {}
 
 private slots:
@@ -49,7 +49,7 @@ class VFlattenDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VFlattenDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	VFlattenDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	double flatness() const;
 	void setFlatness( double value );
diff --git a/karbon/plugins/imagetool/imagetoolplugin.cc b/karbon/plugins/imagetool/imagetoolplugin.cc
index 2bb9962af..5a0d49a8c 100644
--- a/karbon/plugins/imagetool/imagetoolplugin.cc
+++ b/karbon/plugins/imagetool/imagetoolplugin.cc
@@ -31,17 +31,17 @@
 typedef KGenericFactory<ImageToolPlugin> ImageToolPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_imagetoolplugin, ImageToolPluginFactory( "karbonimagetoolplugin" ) )
 
-ImageToolPlugin::ImageToolPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name)
+ImageToolPlugin::ImageToolPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name)
 {
 	setInstance(ImageToolPluginFactory::instance());
 
 	kdDebug() << "VImageToolPlugin. Class: "
 		<< className()
 		<< ", Parent: "
-		<< tqparent -> className()
+		<< parent -> className()
 		<< "\n";
 
-	if ( tqparent->inherits("KarbonFactory") )
+	if ( parent->inherits("KarbonFactory") )
 	{
 		KarbonToolRegistry* r = KarbonToolRegistry::instance();
 		r->add(new KarbonToolFactory<VImageTool>());
diff --git a/karbon/plugins/imagetool/imagetoolplugin.h b/karbon/plugins/imagetool/imagetoolplugin.h
index 236b0ac68..ecd02709b 100644
--- a/karbon/plugins/imagetool/imagetoolplugin.h
+++ b/karbon/plugins/imagetool/imagetoolplugin.h
@@ -32,7 +32,7 @@ class ImageToolPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ImageToolPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+	ImageToolPlugin(TQObject *parent, const char *name, const TQStringList &);
 	virtual ~ImageToolPlugin();
 };
 
diff --git a/karbon/plugins/insertknots/insertknotsplugin.cc b/karbon/plugins/insertknots/insertknotsplugin.cc
index 9f462179c..55fcde760 100644
--- a/karbon/plugins/insertknots/insertknotsplugin.cc
+++ b/karbon/plugins/insertknots/insertknotsplugin.cc
@@ -33,7 +33,7 @@
 typedef KGenericFactory<InsertKnotsPlugin, KarbonView> InsertKnotsPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_insertknotsplugin, InsertKnotsPluginFactory( "karboninsertknotsplugin" ) )
 
-InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(tqparent), name )
+InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name )
 {
 	new KAction(
 		i18n( "&Insert Knots..." ), "14_insertknots", 0, this,
@@ -45,13 +45,13 @@ InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *tqparent, const char* name, co
 void
 InsertKnotsPlugin::slotInsertKnots()
 {
-	KarbonPart *part = ((KarbonView *)tqparent())->part();
+	KarbonPart *part = ((KarbonView *)parent())->part();
 	if( part && m_insertKnotsDlg->exec() )
 		part->addCommand( new VInsertKnotsCmd( &part->document(), m_insertKnotsDlg->knots() ), true );
 }
 
-VInsertKnotsDlg::VInsertKnotsDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true,  i18n( "Insert Knots" ), Ok | Cancel )
+VInsertKnotsDlg::VInsertKnotsDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true,  i18n( "Insert Knots" ), Ok | Cancel )
 {
 	// add input fields:
 	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
diff --git a/karbon/plugins/insertknots/insertknotsplugin.h b/karbon/plugins/insertknots/insertknotsplugin.h
index 4bd2b212f..f8ea9a779 100644
--- a/karbon/plugins/insertknots/insertknotsplugin.h
+++ b/karbon/plugins/insertknots/insertknotsplugin.h
@@ -32,7 +32,7 @@ class InsertKnotsPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	InsertKnotsPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
+	InsertKnotsPlugin( KarbonView *parent, const char* name, const TQStringList & );
 	virtual ~InsertKnotsPlugin() {}
 
 private slots:
@@ -50,7 +50,7 @@ class VInsertKnotsDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VInsertKnotsDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	VInsertKnotsDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	uint knots() const;
 	void setKnots( uint value );
diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cc b/karbon/plugins/roundcorners/roundcornersplugin.cc
index 7003e5109..28ede19d9 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.cc
+++ b/karbon/plugins/roundcorners/roundcornersplugin.cc
@@ -32,7 +32,7 @@
 typedef KGenericFactory<VRoundCornersPlugin, KarbonView> VRoundCornersPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_roundcornersplugin, VRoundCornersPluginFactory( "karbonroundcornersplugin" ) )
 
-VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(tqparent), name )
+VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name )
 {
 	new KAction(
 		i18n( "&Round Corners..." ), "14_roundcorners", 0, this,
@@ -49,14 +49,14 @@ VRoundCornersPlugin::~VRoundCornersPlugin()
 void
 VRoundCornersPlugin::slotRoundCorners()
 {
-	KarbonPart *part = ((KarbonView *)tqparent())->part();
+	KarbonPart *part = ((KarbonView *)parent())->part();
 	if( part && m_roundCornersDlg->exec() )
 		part->addCommand( new VRoundCornersCmd( &part->document(), m_roundCornersDlg->radius() ), true );
 }
 
 
-VRoundCornersDlg::VRoundCornersDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true,  i18n( "Polygonize" ), Ok | Cancel  )
+VRoundCornersDlg::VRoundCornersDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true,  i18n( "Polygonize" ), Ok | Cancel  )
 {
 	// add input:
 	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
diff --git a/karbon/plugins/roundcorners/roundcornersplugin.h b/karbon/plugins/roundcorners/roundcornersplugin.h
index 74e49f884..7806375de 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.h
+++ b/karbon/plugins/roundcorners/roundcornersplugin.h
@@ -33,7 +33,7 @@ class KARBONBASE_EXPORT VRoundCornersPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	VRoundCornersPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
+	VRoundCornersPlugin( KarbonView *parent, const char* name, const TQStringList & );
 	virtual ~VRoundCornersPlugin();
 
 private slots:
@@ -51,7 +51,7 @@ class VRoundCornersDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VRoundCornersDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	VRoundCornersDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	double radius() const;
 	void setRadius( double value );
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
index 7040b0420..dea095712 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
@@ -37,8 +37,8 @@
 typedef KGenericFactory<ShadowEffectPlugin, KarbonView> ShadowEffectPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_shadoweffectplugin, ShadowEffectPluginFactory( "karbonshadoweffectplugin" ) )
 
-ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *tqparent, const char* name, const TQStringList & )
-: Plugin( TQT_TQOBJECT(tqparent), name )
+ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *parent, const char* name, const TQStringList & )
+: Plugin( TQT_TQOBJECT(parent), name )
 {
 	new KAction(
 		i18n( "&Shadow Effect..." ), "shadowRB", 0, this,
@@ -52,13 +52,13 @@ ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *tqparent, const char* name,
 void
 ShadowEffectPlugin::slotShadowEffect()
 {
-	KarbonPart *part = ((KarbonView *)tqparent())->part();
+	KarbonPart *part = ((KarbonView *)parent())->part();
 	if( part && m_shadowEffectDlg->exec() )
 		part->addCommand( new VCreateShadowCmd( &part->document(), m_shadowEffectDlg->distance(), m_shadowEffectDlg->angle(), double( m_shadowEffectDlg->opacity() ) / 255.0 ), true );
 }
 
-VShadowEffectDlg::VShadowEffectDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true,  i18n( "Create Shadow Effect" ), Ok | Cancel )
+VShadowEffectDlg::VShadowEffectDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true,  i18n( "Create Shadow Effect" ), Ok | Cancel )
 {
 	// add input fields on the left:
 	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
@@ -170,7 +170,7 @@ VCreateShadowCmd::execute()
 			if(newObject)
 			{
 				// Insert new tqshape right before old tqshape.
-				itr.current()->tqparent()->insertInfrontOf( 
+				itr.current()->parent()->insertInfrontOf( 
 					newObject, itr.current() );
 
 				// Add new tqshape to list of new objects.
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.h b/karbon/plugins/shadoweffect/shadoweffectplugin.h
index fc500bb7c..890cb2099 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.h
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.h
@@ -33,7 +33,7 @@ class ShadowEffectPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ShadowEffectPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
+	ShadowEffectPlugin( KarbonView *parent, const char* name, const TQStringList & );
 	virtual ~ShadowEffectPlugin() {}
 
 private slots:
@@ -51,7 +51,7 @@ class VShadowEffectDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VShadowEffectDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	VShadowEffectDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	void setAngle( int );
 	void setDistance( int );
diff --git a/karbon/plugins/shadoweffect/vshadowdecorator.cc b/karbon/plugins/shadoweffect/vshadowdecorator.cc
index e6b2f378a..b3c00bdd2 100644
--- a/karbon/plugins/shadoweffect/vshadowdecorator.cc
+++ b/karbon/plugins/shadoweffect/vshadowdecorator.cc
@@ -26,8 +26,8 @@
 #include <core/vselection.h>
 #include <commands/vtransformcmd.h>
 
-VShadowDecorator::VShadowDecorator( VObject *object, VObject* tqparent, int distance, int angle, float opacity )
-	: VObject( tqparent ), m_object( object ), m_distance( distance ), m_angle( angle ), m_opacity( opacity )
+VShadowDecorator::VShadowDecorator( VObject *object, VObject* parent, int distance, int angle, float opacity )
+	: VObject( parent ), m_object( object ), m_distance( distance ), m_angle( angle ), m_opacity( opacity )
 {
 }
 
diff --git a/karbon/plugins/shadoweffect/vshadowdecorator.h b/karbon/plugins/shadoweffect/vshadowdecorator.h
index 0518baf72..fcaa400c0 100644
--- a/karbon/plugins/shadoweffect/vshadowdecorator.h
+++ b/karbon/plugins/shadoweffect/vshadowdecorator.h
@@ -29,7 +29,7 @@
 class KARBONBASE_EXPORT VShadowDecorator : public VObject
 {
 public:
-	VShadowDecorator( VObject* object, VObject* tqparent, int distance = 2, int angle = 0, float opacity = 1.0 );
+	VShadowDecorator( VObject* object, VObject* parent, int distance = 2, int angle = 0, float opacity = 1.0 );
 	VShadowDecorator( const VShadowDecorator& obj );
 
 	virtual ~VShadowDecorator();
diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cc b/karbon/plugins/whirlpinch/whirlpinchplugin.cc
index 9ad72ed58..ec8e70757 100644
--- a/karbon/plugins/whirlpinch/whirlpinchplugin.cc
+++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cc
@@ -38,7 +38,7 @@
 typedef KGenericFactory<WhirlPinchPlugin, KarbonView> WhirlPinchPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_whirlpinchplugin, WhirlPinchPluginFactory( "karbonwhirlpinchplugin" ) )
 
-WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(tqparent), name )
+WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name )
 {
 	new KAction(
 		i18n( "&Whirl/Pinch..." ), "14_whirl", 0, this,
@@ -53,13 +53,13 @@ WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *tqparent, const char* name, cons
 void
 WhirlPinchPlugin::slotWhirlPinch()
 {
-	KarbonPart *part = ((KarbonView *)tqparent())->part();
+	KarbonPart *part = ((KarbonView *)parent())->part();
 	if( part && m_whirlPinchDlg->exec() )
 		part->addCommand( new VWhirlPinchCmd( &part->document(), m_whirlPinchDlg->angle(), m_whirlPinchDlg->pinch(), m_whirlPinchDlg->radius() ), true );
 }
 
-VWhirlPinchDlg::VWhirlPinchDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Whirl Pinch" ), Ok | Cancel )
+VWhirlPinchDlg::VWhirlPinchDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Whirl Pinch" ), Ok | Cancel )
 {
 	// add input fields:
 	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.h b/karbon/plugins/whirlpinch/whirlpinchplugin.h
index 215f9bcd4..bf9d16b48 100644
--- a/karbon/plugins/whirlpinch/whirlpinchplugin.h
+++ b/karbon/plugins/whirlpinch/whirlpinchplugin.h
@@ -32,7 +32,7 @@ class WhirlPinchPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	WhirlPinchPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
+	WhirlPinchPlugin( KarbonView *parent, const char* name, const TQStringList & );
 	virtual ~WhirlPinchPlugin() {}
 
 private slots:
@@ -50,7 +50,7 @@ class VWhirlPinchDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VWhirlPinchDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	VWhirlPinchDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	double angle() const;
 	double pinch() const;
diff --git a/karbon/plugins/zoomtool/zoomtoolplugin.cc b/karbon/plugins/zoomtool/zoomtoolplugin.cc
index 5a9a01157..3ad73ee9f 100644
--- a/karbon/plugins/zoomtool/zoomtoolplugin.cc
+++ b/karbon/plugins/zoomtool/zoomtoolplugin.cc
@@ -30,18 +30,18 @@
 typedef KGenericFactory<ZoomToolPlugin> ZoomToolPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_zoomtoolplugin, ZoomToolPluginFactory( "karbonzoomtoolplugin" ) )
 
-ZoomToolPlugin::ZoomToolPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-	: KParts::Plugin(tqparent, name)
+ZoomToolPlugin::ZoomToolPlugin(TQObject *parent, const char *name, const TQStringList &)
+	: KParts::Plugin(parent, name)
 {
 	setInstance(ZoomToolPluginFactory::instance());
 
 	kdDebug() << "Zoom tool plugin. Class: "
 		<< className()
 		<< ", Parent: "
-		<< tqparent -> className()
+		<< parent -> className()
 		<< "\n";
 
-	if ( tqparent->inherits("KarbonFactory") )
+	if ( parent->inherits("KarbonFactory") )
 	{
 		KarbonToolRegistry* r = KarbonToolRegistry::instance();
 		r -> add(new KarbonToolFactory<VZoomTool>());
diff --git a/karbon/plugins/zoomtool/zoomtoolplugin.h b/karbon/plugins/zoomtool/zoomtoolplugin.h
index 9501832ff..62c7594bb 100644
--- a/karbon/plugins/zoomtool/zoomtoolplugin.h
+++ b/karbon/plugins/zoomtool/zoomtoolplugin.h
@@ -33,7 +33,7 @@ class ZoomToolPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ZoomToolPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+	ZoomToolPlugin(TQObject *parent, const char *name, const TQStringList &);
 	virtual ~ZoomToolPlugin();
 };
 
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
index bbafa3931..b9cf93766 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
@@ -1103,7 +1103,7 @@ xlib_window_is_viewable (Window w)
 	XWindowAttributes wa;
 
 	while (w != 0) {
-		Window tqparent, root, *tqchildren;
+		Window parent, root, *tqchildren;
 		int ntqchildren;
 
 		XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
@@ -1111,16 +1111,16 @@ xlib_window_is_viewable (Window w)
 			return 0;
 
 		if (!XQueryTree (gdk_pixbuf_dpy, w, &root,
-				 &tqparent, &tqchildren, &ntqchildren))
+				 &parent, &tqchildren, &ntqchildren))
 			return 0;
 
 		if (ntqchildren > 0)
 			XFree (tqchildren);
 
-		if (tqparent == root)
+		if (parent == root)
 			return 1;
 
-		w = tqparent;
+		w = parent;
 	}
 
 	return 0;
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
index be1a839c6..f24391381 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
@@ -31,7 +31,7 @@
 **
  * gdk_pixbuf_xlib_render_threshold_alpha:
  * @pixbuf: A pixbuf.
- * @bitmap: Bitmap where the bilevel tqmask will be painted to.
+ * @bitmap: Bitmap where the bilevel mask will be painted to.
  * @src_x: Source X coordinate.
  * @src_y: source Y coordinate.
  * @dest_x: Destination X coordinate.
@@ -42,7 +42,7 @@
  * other values will be painted as one.
  *
  * Takes the opacity values in a rectangular portion of a pixbuf and thresholds
- * them to produce a bi-level alpha tqmask that can be used as a clipping tqmask for
+ * them to produce a bi-level alpha mask that can be used as a clipping mask for
  * a drawable.
  *
 void
@@ -177,7 +177,7 @@ remove_alpha (GdkPixbuf *pixbuf, int x, int y, int width, int height, int *rowst
  * specified GC.  This is done using XlibRGB, so the specified drawable must
  * have the XlibRGB visual and colormap.  Note that this function will ignore
  * the opacity information for images with an alpha channel; the GC must already
- * have the clipping tqmask set if you want transparent regions to show through.
+ * have the clipping mask set if you want transparent regions to show through.
  *
  * For an explanation of dither offsets, see the XlibRGB documentation.  In
  * brief, the dither offset is important when re-rendering partial regions of an
@@ -255,7 +255,7 @@ gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
  *
  * When used with #GDK_PIXBUF_ALPHA_BILEVEL, this function has to create a bitmap
  * out of the thresholded alpha channel of the image and, it has to set this
- * bitmap as the clipping tqmask for the GC used for drawing.  This can be a
+ * bitmap as the clipping mask for the GC used for drawing.  This can be a
  * significant performance penalty depending on the size and the complexity of
  * the alpha channel of the image.  If performance is crucial, consider handling
  * the alpha channel yourself (possibly by caching it in your application) and
@@ -320,12 +320,12 @@ gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
 
  * @pixbuf: A pixbuf.
  * @pixmap_return: Return value for the created pixmap.
- * @mask_return: Return value for the created tqmask.
+ * @mask_return: Return value for the created mask.
  * @alpha_threshold: Threshold value for opacity values.
  *
- * Creates a pixmap and a tqmask bitmap which are returned in the @pixmap_return
+ * Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
  * and @mask_return arguments, respectively, and renders a pixbuf and its
- * corresponding tresholded alpha tqmask to them.  This is merely a convenience
+ * corresponding tresholded alpha mask to them.  This is merely a convenience
  * function; applications that need to render pixbufs with dither offsets or to
  * given drawables should use gdk_pixbuf_xlib_render_to_drawable_alpha() or
  * gdk_pixbuf_xlib_render_to_drawable(), and
@@ -334,7 +334,7 @@ gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
  * If the pixbuf does not have an alpha channel, then *@mask_return will be set
  * to None.
 void
-gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
+gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
 					Pixmap *pixmap_return,
 					Pixmap *mask_return,
 					int alpha_threshold)
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib.h b/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
index 63961ea79..2b31ed7ec 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
@@ -63,7 +63,7 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
 					       XlibRgbDither dither,
 					       int x_dither, int y_dither);
 
-void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
+void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
 					     Pixmap *pixmap_return,
 					     Pixmap *mask_return,
 					     int alpha_threshold);
diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cc
index 15f5ce1cf..0b5fd80c2 100644
--- a/karbon/shapes/vellipse.cc
+++ b/karbon/shapes/vellipse.cc
@@ -30,14 +30,14 @@
 #include <tqdom.h>
 #include <core/vfill.h>
 
-VEllipse::VEllipse( VObject* tqparent, VState state ) : VPath( tqparent, state )
+VEllipse::VEllipse( VObject* parent, VState state ) : VPath( parent, state )
 {
 }
 
-VEllipse::VEllipse( VObject* tqparent,
+VEllipse::VEllipse( VObject* parent,
 		const KoPoint& topLeft, double width, double height,
 		VEllipseType type, double startAngle, double endAngle )
-	: VPath( tqparent ), m_type( type ), m_startAngle( startAngle ), m_endAngle( endAngle )
+	: VPath( parent ), m_type( type ), m_startAngle( startAngle ), m_endAngle( endAngle )
 {
 	setDrawCenterNode();
 
diff --git a/karbon/shapes/vellipse.h b/karbon/shapes/vellipse.h
index 98f0ec11c..5a2346d5f 100644
--- a/karbon/shapes/vellipse.h
+++ b/karbon/shapes/vellipse.h
@@ -33,8 +33,8 @@ public:
 		cut,
 		arc
 	};
-	VEllipse( VObject* tqparent, VState state = edit );
-	VEllipse( VObject* tqparent,
+	VEllipse( VObject* parent, VState state = edit );
+	VEllipse( VObject* parent,
 		const KoPoint& topLeft, double width, double height,
 		VEllipseType type = full, double startAngle = 0, double endAngle = 0 );
 
diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc
index 47f07a68a..650b4698f 100644
--- a/karbon/shapes/vpolygon.cc
+++ b/karbon/shapes/vpolygon.cc
@@ -30,14 +30,14 @@
 #include <KoXmlNS.h>
 #include <vdocument.h>
 
-VPolygon::VPolygon( VObject* tqparent, VState state ) 
-	: VPath( tqparent, state )
+VPolygon::VPolygon( VObject* parent, VState state ) 
+	: VPath( parent, state )
 {
 }
 
-VPolygon::VPolygon( VObject* tqparent, const TQString &points,
+VPolygon::VPolygon( VObject* parent, const TQString &points,
 		const KoPoint& topLeft, double width, double height )
-	: VPath( tqparent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_points( points )
+	: VPath( parent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_points( points )
 {
 	init();
 }
diff --git a/karbon/shapes/vpolygon.h b/karbon/shapes/vpolygon.h
index fcb308501..a483a37a9 100644
--- a/karbon/shapes/vpolygon.h
+++ b/karbon/shapes/vpolygon.h
@@ -25,8 +25,8 @@
 class VPolygon : public VPath
 {
 public:
-	VPolygon( VObject* tqparent, VState state = edit );
-	VPolygon( VObject* tqparent, const TQString &points,
+	VPolygon( VObject* parent, VState state = edit );
+	VPolygon( VObject* parent, const TQString &points,
 		const KoPoint& topLeft, double width, double height );
 
 	virtual TQString name() const;
diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc
index 85faa0f71..d716c3250 100644
--- a/karbon/shapes/vpolyline.cc
+++ b/karbon/shapes/vpolyline.cc
@@ -30,18 +30,18 @@
 #include <KoXmlWriter.h>
 #include <KoXmlNS.h>
 
-VPolyline::VPolyline( VObject* tqparent, VState state )
-	: VPath( tqparent, state )
+VPolyline::VPolyline( VObject* parent, VState state )
+	: VPath( parent, state )
 {
 }
 
-/*VPolyline::VPolyline( VObject* tqparent, VState state ) 
-	: VPath( tqparent, state )
+/*VPolyline::VPolyline( VObject* parent, VState state ) 
+	: VPath( parent, state )
 {
 }*/
 
-/*VPolyline::VPolyline( VObject* tqparent, const TQString &points ) 
-	: VPath( tqparent ), m_points( points )
+/*VPolyline::VPolyline( VObject* parent, const TQString &points ) 
+	: VPath( parent ), m_points( points )
 {
 	init();
 }*/
diff --git a/karbon/shapes/vpolyline.h b/karbon/shapes/vpolyline.h
index cc08c87b9..ad746c3ec 100644
--- a/karbon/shapes/vpolyline.h
+++ b/karbon/shapes/vpolyline.h
@@ -26,9 +26,9 @@
 class VPolyline : public VPath
 {
 public:
-	VPolyline( VObject* tqparent, VState state = edit );
-	//VPolyline( VObject* tqparent, VState state = edit );
-	//VPolyline( VObject* tqparent, const TQString &points  );
+	VPolyline( VObject* parent, VState state = edit );
+	//VPolyline( VObject* parent, VState state = edit );
+	//VPolyline( VObject* parent, const TQString &points  );
 
 	virtual TQString name() const;
 
diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cc
index 01d1d2430..bb3512fd9 100644
--- a/karbon/shapes/vrectangle.cc
+++ b/karbon/shapes/vrectangle.cc
@@ -30,14 +30,14 @@
 #include <vdocument.h>
 #include "vtransformcmd.h"
 
-VRectangle::VRectangle( VObject* tqparent, VState state )
-	: VPath( tqparent, state )
+VRectangle::VRectangle( VObject* parent, VState state )
+	: VPath( parent, state )
 {
 }
 
-VRectangle::VRectangle( VObject* tqparent,
+VRectangle::VRectangle( VObject* parent,
 		const KoPoint& topLeft, double width, double height, double rx, double ry )
-	: VPath( tqparent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_rx( rx ), m_ry( ry )
+	: VPath( parent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_rx( rx ), m_ry( ry )
 {
 	setDrawCenterNode();
 
diff --git a/karbon/shapes/vrectangle.h b/karbon/shapes/vrectangle.h
index 08c4e0857..c56047082 100644
--- a/karbon/shapes/vrectangle.h
+++ b/karbon/shapes/vrectangle.h
@@ -26,8 +26,8 @@
 class KARBONBASE_EXPORT VRectangle : public VPath
 {
 public:
-	VRectangle( VObject* tqparent, VState state = edit );
-	VRectangle( VObject* tqparent,
+	VRectangle( VObject* parent, VState state = edit );
+	VRectangle( VObject* parent,
 		const KoPoint& topLeft, double width, double height, double rx = 0.0, double ry = 0.0 );
 
 	virtual TQString name() const;
diff --git a/karbon/shapes/vsinus.cc b/karbon/shapes/vsinus.cc
index 6c546135d..362ed800d 100644
--- a/karbon/shapes/vsinus.cc
+++ b/karbon/shapes/vsinus.cc
@@ -28,14 +28,14 @@
 #include <tqdom.h>
 #include <vdocument.h>
 
-VSinus::VSinus( VObject* tqparent, VState state )
-	: VPath( tqparent, state )
+VSinus::VSinus( VObject* parent, VState state )
+	: VPath( parent, state )
 {
 }
 
-VSinus::VSinus( VObject* tqparent,
+VSinus::VSinus( VObject* parent,
 		const KoPoint& topLeft, double width, double height, uint periods )
-	: VPath( tqparent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_periods( periods )
+	: VPath( parent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_periods( periods )
 {
 	// We want at least 1 period:
 	if( m_periods < 1 )
diff --git a/karbon/shapes/vsinus.h b/karbon/shapes/vsinus.h
index 10b902d85..89510d0fb 100644
--- a/karbon/shapes/vsinus.h
+++ b/karbon/shapes/vsinus.h
@@ -26,8 +26,8 @@
 class KARBONBASE_EXPORT VSinus : public VPath
 {
 public:
-	VSinus( VObject* tqparent, VState state = edit );
-	VSinus( VObject* tqparent,
+	VSinus( VObject* parent, VState state = edit );
+	VSinus( VObject* parent,
 		const KoPoint& topLeft, double width, double height, uint periods );
 
 	virtual TQString name() const;
diff --git a/karbon/shapes/vspiral.cc b/karbon/shapes/vspiral.cc
index cad37ccd3..0df884856 100644
--- a/karbon/shapes/vspiral.cc
+++ b/karbon/shapes/vspiral.cc
@@ -30,15 +30,15 @@
 #include <KoUnit.h>
 #include <vdocument.h>
 
-VSpiral::VSpiral( VObject* tqparent, VState state )
-	: VPath( tqparent, state )
+VSpiral::VSpiral( VObject* parent, VState state )
+	: VPath( parent, state )
 {
 }
 
-VSpiral::VSpiral( VObject* tqparent,
+VSpiral::VSpiral( VObject* parent,
 		const KoPoint& center, double radius, uint segments, double fade,
 		bool clockwise, double angle, VSpiralType type )
-	: VPath( tqparent ), m_center( center), m_radius( radius ), m_fade( fade ), m_segments( segments ), m_clockwise( clockwise ), m_angle( angle ), m_type( type )
+	: VPath( parent ), m_center( center), m_radius( radius ), m_fade( fade ), m_segments( segments ), m_clockwise( clockwise ), m_angle( angle ), m_type( type )
 {
 	init();
 }
diff --git a/karbon/shapes/vspiral.h b/karbon/shapes/vspiral.h
index fc99436c6..9411afc2e 100644
--- a/karbon/shapes/vspiral.h
+++ b/karbon/shapes/vspiral.h
@@ -31,8 +31,8 @@ public:
 		round,
 		rectangular
 	};
-	VSpiral( VObject* tqparent, VState state = edit );
-	VSpiral( VObject* tqparent,
+	VSpiral( VObject* parent, VState state = edit );
+	VSpiral( VObject* parent,
 		const KoPoint& center, double radius, uint segments,
 		double fade, bool clockwise, double angle = 0.0, VSpiralType type = round );
 
diff --git a/karbon/shapes/vstar.cc b/karbon/shapes/vstar.cc
index 11f8ef86f..260c1664a 100644
--- a/karbon/shapes/vstar.cc
+++ b/karbon/shapes/vstar.cc
@@ -30,15 +30,15 @@
 #include <KoUnit.h>
 #include <vdocument.h>
 
-VStar::VStar( VObject* tqparent, VState state )
-	: VPath( tqparent, state )
+VStar::VStar( VObject* parent, VState state )
+	: VPath( parent, state )
 {
 }
 
-VStar::VStar( VObject* tqparent,
+VStar::VStar( VObject* parent,
 		const KoPoint& center, double outerRadius, double innerRadius,
 		uint edges, double angle, uint innerAngle, double roundness, VStarType type )
-	: VPath( tqparent ), m_center( center), m_outerRadius( outerRadius ), m_innerRadius( innerRadius), m_edges( edges ), m_angle( angle ), m_innerAngle( innerAngle ), m_roundness( roundness ), m_type( type )
+	: VPath( parent ), m_center( center), m_outerRadius( outerRadius ), m_innerRadius( innerRadius), m_edges( edges ), m_angle( angle ), m_innerAngle( innerAngle ), m_roundness( roundness ), m_type( type )
 {
 	init();
 }
diff --git a/karbon/shapes/vstar.h b/karbon/shapes/vstar.h
index 9a4096eab..d82cdf9e1 100644
--- a/karbon/shapes/vstar.h
+++ b/karbon/shapes/vstar.h
@@ -57,8 +57,8 @@ public:
 		star,
 		gear
 	};
-	VStar( VObject* tqparent, VState state = edit );
-	VStar( VObject* tqparent,
+	VStar( VObject* parent, VState state = edit );
+	VStar( VObject* parent,
 		const KoPoint& center, double outerRadius, double innerRadius,
 		uint edges, double angle = 0.0, uint innerAngle = 0,
 		double roundness = 0.0, VStarType type = star_outline );
diff --git a/karbon/tools/vdefaulttools.cc b/karbon/tools/vdefaulttools.cc
index ecc5e0487..3be8a8bd2 100644
--- a/karbon/tools/vdefaulttools.cc
+++ b/karbon/tools/vdefaulttools.cc
@@ -47,18 +47,18 @@
 typedef KGenericFactory<VDefaultTools> VDefaultToolsFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_defaulttools, VDefaultToolsFactory( "karbon_defaulttools" ) )
 
-VDefaultTools::VDefaultTools(TQObject *tqparent, const char *name, const TQStringList &)
-	: KParts::Plugin(tqparent, name)
+VDefaultTools::VDefaultTools(TQObject *parent, const char *name, const TQStringList &)
+	: KParts::Plugin(parent, name)
 {
 	setInstance(VDefaultToolsFactory::instance());
 
 	kdDebug() << "VDefaultTools. Class: "
 		<< className()
 		<< ", Parent: "
-		<< tqparent -> className()
+		<< parent -> className()
 		<< "\n";
 
-	if ( tqparent->inherits("KarbonFactory") )
+	if ( parent->inherits("KarbonFactory") )
 	{
 		KarbonToolRegistry* r = KarbonToolRegistry::instance();
 		r->add(new KarbonToolFactory<VSelectTool>());
diff --git a/karbon/tools/vdefaulttools.h b/karbon/tools/vdefaulttools.h
index 0c88eb4af..f237a4e4e 100644
--- a/karbon/tools/vdefaulttools.h
+++ b/karbon/tools/vdefaulttools.h
@@ -33,7 +33,7 @@ class VDefaultTools : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	VDefaultTools(TQObject *tqparent, const char *name, const TQStringList &);
+	VDefaultTools(TQObject *parent, const char *name, const TQStringList &);
 	virtual ~VDefaultTools();
 };
 
diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc
index 49e80ec8a..41936226a 100644
--- a/karbon/tools/vellipsetool.cc
+++ b/karbon/tools/vellipsetool.cc
@@ -34,8 +34,8 @@
 #include "vglobal.h"
 
 
-VEllipseOptionsWidget::VEllipseOptionsWidget( KarbonPart *part, TQWidget *tqparent, const char *name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Ellipse" ), Ok | Cancel ), m_part( part )
+VEllipseOptionsWidget::VEllipseOptionsWidget( KarbonPart *part, TQWidget *parent, const char *name )
+	: KDialogBase( parent, name, true, i18n( "Insert Ellipse" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 	new TQLabel( i18n( "Type:" ), group );
diff --git a/karbon/tools/vellipsetool.h b/karbon/tools/vellipsetool.h
index c07d2e77a..859cac961 100644
--- a/karbon/tools/vellipsetool.h
+++ b/karbon/tools/vellipsetool.h
@@ -36,7 +36,7 @@ class VEllipseOptionsWidget : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	VEllipseOptionsWidget( KarbonPart *part, TQWidget *tqparent = 0L, const char *name = 0L );
+	VEllipseOptionsWidget( KarbonPart *part, TQWidget *parent = 0L, const char *name = 0L );
 
 	double width() const;
 	double height() const;
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc
index d522652c7..893c84816 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cc
@@ -45,8 +45,8 @@
 #include <commands/vstrokecmd.h>
 #include <widgets/vstrokefillpreview.h>
 
-VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidget* tqparent )
-	: KDialogBase( tqparent, "", true, i18n( "Choose Pattern" ), Ok | Cancel ), m_pattern( 0 )
+VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidget* parent )
+	: KDialogBase( parent, "", true, i18n( "Choose Pattern" ), Ok | Cancel ), m_pattern( 0 )
 {
 	TQWidget *base = new TQWidget( this );
 	TQVBoxLayout* tqlayout = new TQVBoxLayout( base );
diff --git a/karbon/tools/vpatterntool.h b/karbon/tools/vpatterntool.h
index 8812ce4fa..a7153c969 100644
--- a/karbon/tools/vpatterntool.h
+++ b/karbon/tools/vpatterntool.h
@@ -36,7 +36,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool* tool, TQWidget* tqparent = 0L );
+	VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool* tool, TQWidget* parent = 0L );
 	~VPatternWidget();
 
 	VPattern* selectedPattern();
diff --git a/karbon/tools/vpenciltool.cc b/karbon/tools/vpenciltool.cc
index 587182de7..9f2759b34 100644
--- a/karbon/tools/vpenciltool.cc
+++ b/karbon/tools/vpenciltool.cc
@@ -51,8 +51,8 @@
 
 #include "vpenciltool.moc"
 
-VPencilOptionsWidget::VPencilOptionsWidget( KarbonView*view, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Pencil Settings" ), Ok | Cancel ), m_view( view )
+VPencilOptionsWidget::VPencilOptionsWidget( KarbonView*view, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Pencil Settings" ), Ok | Cancel ), m_view( view )
 {
 	TQVBox *vbox = new TQVBox( this );
 
diff --git a/karbon/tools/vpenciltool.h b/karbon/tools/vpenciltool.h
index d2bca7445..7f962d555 100644
--- a/karbon/tools/vpenciltool.h
+++ b/karbon/tools/vpenciltool.h
@@ -47,7 +47,7 @@ class VPencilOptionsWidget : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		VPencilOptionsWidget( KarbonView*view, TQWidget* tqparent = 0L, const char* name = 0L );
+		VPencilOptionsWidget( KarbonView*view, TQWidget* parent = 0L, const char* name = 0L );
 
 		int currentMode();
 		bool optimize();
diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc
index 8fd8d7409..db1ffb886 100644
--- a/karbon/tools/vpolygontool.cc
+++ b/karbon/tools/vpolygontool.cc
@@ -30,8 +30,8 @@
 #include <shapes/vstar.h>
 #include "vpolygontool.h"
 
-VPolygonTool::VPolygonOptionsWidget::VPolygonOptionsWidget( KarbonView *view, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Polygon" ), Ok | Cancel ), m_view(view)
+VPolygonTool::VPolygonOptionsWidget::VPolygonOptionsWidget( KarbonView *view, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Polygon" ), Ok | Cancel ), m_view(view)
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 
diff --git a/karbon/tools/vpolygontool.h b/karbon/tools/vpolygontool.h
index 227e9d379..052d7e504 100644
--- a/karbon/tools/vpolygontool.h
+++ b/karbon/tools/vpolygontool.h
@@ -48,7 +48,7 @@ private:
 	class VPolygonOptionsWidget : public KDialogBase
 	{
 	public:
-		VPolygonOptionsWidget( KarbonView *view, TQWidget *tqparent = 0L, const char *name = 0L );
+		VPolygonOptionsWidget( KarbonView *view, TQWidget *parent = 0L, const char *name = 0L );
 
 		double radius() const;
 		uint edges() const;
diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc
index d3668fc42..7d949ac73 100644
--- a/karbon/tools/vrectangletool.cc
+++ b/karbon/tools/vrectangletool.cc
@@ -30,8 +30,8 @@
 #include <KoUnitWidgets.h>
 
 
-VRectangleTool::VRectangleOptionsWidget::VRectangleOptionsWidget( KarbonPart *part, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Rectangle" ), Ok | Cancel ), m_part( part )
+VRectangleTool::VRectangleOptionsWidget::VRectangleOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Rectangle" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 	// add width/height-input:
diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h
index 2b71e27ea..b902b1ab1 100644
--- a/karbon/tools/vrectangletool.h
+++ b/karbon/tools/vrectangletool.h
@@ -47,7 +47,7 @@ private:
 	class VRectangleOptionsWidget : public KDialogBase
 	{
 	public:
-		VRectangleOptionsWidget( KarbonPart *part, TQWidget* tqparent = 0L, const char* name = 0L );
+		VRectangleOptionsWidget( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L );
 
 		double width() const;
 		double height() const;
diff --git a/karbon/tools/vroundrecttool.cc b/karbon/tools/vroundrecttool.cc
index 0e97530f8..b7f354cfa 100644
--- a/karbon/tools/vroundrecttool.cc
+++ b/karbon/tools/vroundrecttool.cc
@@ -31,8 +31,8 @@
 
 #include <kgenericfactory.h>
 
-VRoundRectTool::VRoundRectOptionsWidget::VRoundRectOptionsWidget( KarbonPart *part, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Round Rect" ), Ok | Cancel ), m_part( part )
+VRoundRectTool::VRoundRectOptionsWidget::VRoundRectOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Round Rect" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 	new TQLabel( i18n( "object width", "Width:" ), group );
diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h
index 9b70bf270..59a2fab08 100644
--- a/karbon/tools/vroundrecttool.h
+++ b/karbon/tools/vroundrecttool.h
@@ -51,7 +51,7 @@ private:
 	class VRoundRectOptionsWidget : public KDialogBase
 	{
 	public:
-		VRoundRectOptionsWidget( KarbonPart *part, TQWidget *tqparent = 0L, const char *name = 0L );
+		VRoundRectOptionsWidget( KarbonPart *part, TQWidget *parent = 0L, const char *name = 0L );
 
 		double width() const;
 		double height() const;
diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc
index 4982141bf..f95bc2c5a 100644
--- a/karbon/tools/vsinustool.cc
+++ b/karbon/tools/vsinustool.cc
@@ -32,8 +32,8 @@
 #include "KoUnitWidgets.h"
 
 
-VSinusTool::VSinusOptionsWidget::VSinusOptionsWidget( KarbonPart *part, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Sinus" ), Ok | Cancel ), m_part( part )
+VSinusTool::VSinusOptionsWidget::VSinusOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Sinus" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 
diff --git a/karbon/tools/vsinustool.h b/karbon/tools/vsinustool.h
index 8e2adfc3d..71669ebdc 100644
--- a/karbon/tools/vsinustool.h
+++ b/karbon/tools/vsinustool.h
@@ -46,7 +46,7 @@ private:
 	class VSinusOptionsWidget : public KDialogBase
 	{
 	public:
-		VSinusOptionsWidget( KarbonPart *part, TQWidget *tqparent = 0L, const char *name = 0L );
+		VSinusOptionsWidget( KarbonPart *part, TQWidget *parent = 0L, const char *name = 0L );
 
 		double width() const;
 		double height() const;
diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc
index 584013096..304c86373 100644
--- a/karbon/tools/vspiraltool.cc
+++ b/karbon/tools/vspiraltool.cc
@@ -31,8 +31,8 @@
 #include "KoUnitWidgets.h"
 
 
-VSpiralTool::VSpiralOptionsWidget::VSpiralOptionsWidget( KarbonPart *part, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Spiral" ), Ok | Cancel ), m_part( part )
+VSpiralTool::VSpiralOptionsWidget::VSpiralOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Spiral" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 
diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h
index 9a09bd830..5787063d8 100644
--- a/karbon/tools/vspiraltool.h
+++ b/karbon/tools/vspiraltool.h
@@ -51,7 +51,7 @@ private:
 	class VSpiralOptionsWidget : public KDialogBase
 	{
 	public:
-		VSpiralOptionsWidget( KarbonPart *part, TQWidget *tqparent = 0L, const char* name = 0L );
+		VSpiralOptionsWidget( KarbonPart *part, TQWidget *parent = 0L, const char* name = 0L );
 
 		double radius() const;
 		uint segments() const;
diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc
index 6110969a0..42c74f4e1 100644
--- a/karbon/tools/vstartool.cc
+++ b/karbon/tools/vstartool.cc
@@ -31,8 +31,8 @@
 #include "KoUnitWidgets.h"
 
 
-VStarOptionsWidget::VStarOptionsWidget( KarbonPart *part, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Star" ), Ok | Cancel ), m_part( part )
+VStarOptionsWidget::VStarOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Star" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 	new TQLabel( i18n( "Type:" ), group );
diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h
index 3ab94916c..07d744c0f 100644
--- a/karbon/tools/vstartool.h
+++ b/karbon/tools/vstartool.h
@@ -36,7 +36,7 @@ class VStarOptionsWidget : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	VStarOptionsWidget( KarbonPart *part, TQWidget* tqparent = 0L, const char* name = 0L );
+	VStarOptionsWidget( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L );
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 67776ac31..a35001605 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -68,8 +68,8 @@ traceShape( VKoPainter* p, int x, int y, int w, int h )
 	p->lineTo( KoPoint( x , y ) );
 }
 
-ShadowPreview::ShadowPreview( ShadowWidget* tqparent )
-		: TQWidget( tqparent ), m_parent( tqparent )
+ShadowPreview::ShadowPreview( ShadowWidget* parent )
+		: TQWidget( parent ), m_parent( parent )
 {
 	setBackgroundMode( TQt::NoBackground );
 	setMinimumSize( 60, 60 );
@@ -201,8 +201,8 @@ ShadowPreview::paintEvent( TQPaintEvent* )
 	painter.drawLine( width() / 2, height() / 2 - 2, width() / 2, height() / 2 + 2 );
 }
 
-ShadowWidget::ShadowWidget( TQWidget* tqparent, const char* name, int angle, int distance, bool translucent )
-		: TQGroupBox( tqparent, name )
+ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int distance, bool translucent )
+		: TQGroupBox( parent, name )
 {
 	setTitle( i18n( "Shadow" ) );
 	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
@@ -314,8 +314,8 @@ ShadowWidget::updatePreview()
 	m_translucent->setEnabled( ok );
 }
 
-VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *tqparent )
-	: KDialogBase( tqparent, "", true, i18n( "Text" ), Ok | Cancel ), m_tool( tool )
+VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent )
+	: KDialogBase( parent, "", true, i18n( "Text" ), Ok | Cancel ), m_tool( tool )
 {
 	//tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 	//setFrameStyle( Box | Sunken );
diff --git a/karbon/tools/vtexttool.h b/karbon/tools/vtexttool.h
index ccecb1922..cd3c4e87d 100644
--- a/karbon/tools/vtexttool.h
+++ b/karbon/tools/vtexttool.h
@@ -51,7 +51,7 @@ class ShadowPreview : public TQWidget
   TQ_OBJECT
 
 public:
-	ShadowPreview( ShadowWidget* tqparent );
+	ShadowPreview( ShadowWidget* parent );
 	~ShadowPreview();
 
 signals:
@@ -72,7 +72,7 @@ class ShadowWidget : public TQGroupBox
   TQ_OBJECT
 
 public:
-	ShadowWidget( TQWidget* tqparent, const char* name, int angle, int distance, bool translucent );
+	ShadowWidget( TQWidget* parent, const char* name, int angle, int distance, bool translucent );
 	~ShadowWidget();
 
 	void setUseShadow( bool use );
@@ -104,7 +104,7 @@ class VTextOptionsWidget : public KDialogBase
   TQ_OBJECT
 
 public:
-	VTextOptionsWidget( VTextTool* tool, TQWidget *tqparent );
+	VTextOptionsWidget( VTextTool* tool, TQWidget *parent );
 	~VTextOptionsWidget();
 
 	void setFont( const TQFont& font );
diff --git a/karbon/visitors/vselectnodes.cc b/karbon/visitors/vselectnodes.cc
index 6d297c965..00f56de39 100644
--- a/karbon/visitors/vselectnodes.cc
+++ b/karbon/visitors/vselectnodes.cc
@@ -101,7 +101,7 @@ VSelectNodes::visitVSubpath( VSubpath& path )
 void
 VSelectNodes::visitVLayer( VLayer& layer )
 {
-	VDocument* doc = (VDocument*)layer.tqparent();
+	VDocument* doc = (VDocument*)layer.parent();
 	if ( ( layer.state() != VObject::deleted ) &&
 	     ( ( doc->selectionMode() == VDocument::AllLayers ) ||
 	       ( doc->selectionMode() == VDocument::VisibleLayers && ( layer.state() == VObject::normal || layer.state() == VObject::normal_locked ) ) ||
@@ -138,7 +138,7 @@ VTestNodes::visitVSubpath( VSubpath& path )
 void
 VTestNodes::visitVLayer( VLayer& layer )
 {
-	VDocument* doc = (VDocument*)layer.tqparent();
+	VDocument* doc = (VDocument*)layer.parent();
 	if ( ( layer.state() != VObject::deleted ) &&
 	     ( ( doc->selectionMode() == VDocument::AllLayers ) ||
 	       ( doc->selectionMode() == VDocument::VisibleLayers && ( layer.state() == VObject::normal || layer.state() == VObject::normal_locked ) ) ||
diff --git a/karbon/visitors/vselectobjects.cc b/karbon/visitors/vselectobjects.cc
index 0a428c43c..060eeacbc 100644
--- a/karbon/visitors/vselectobjects.cc
+++ b/karbon/visitors/vselectobjects.cc
@@ -205,7 +205,7 @@ VSelectObjects::visitVObject( VObject& object )
 void
 VSelectObjects::visitVLayer( VLayer& layer )
 {
-	VDocument* doc = (VDocument*)layer.tqparent();
+	VDocument* doc = (VDocument*)layer.parent();
 	if ( ( layer.state() != VObject::deleted ) &&
 	     ( ( doc->selectionMode() == VDocument::AllLayers ) ||
 	       ( doc->selectionMode() == VDocument::VisibleLayers && ( layer.state() == VObject::normal || layer.state() == VObject::normal_locked ) ) ||
diff --git a/karbon/vtool.h b/karbon/vtool.h
index 3eabbe76e..877dc41b7 100644
--- a/karbon/vtool.h
+++ b/karbon/vtool.h
@@ -308,7 +308,7 @@ protected:
 	/** The tool's action object. */
 	KRadioAction *m_action;
 
-	/** Helper function. Returns the tqparent view's toolcontroller. */
+	/** Helper function. Returns the parent view's toolcontroller. */
 	VToolController *toolController() const;
 
 private:
diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc
index 96db15d85..d96018b9b 100644
--- a/karbon/widgets/vcanvas.cc
+++ b/karbon/widgets/vcanvas.cc
@@ -93,8 +93,8 @@ KoPoint VCanvas::snapToGrid( const KoPoint &point )
 }
 
 
-VCanvas::VCanvas( TQWidget *tqparent, KarbonView* view, KarbonPart* part )
-    : TQScrollView( tqparent, "canvas", WStaticContents/*WNorthWestGravity*/ | WResizeNoErase  |
+VCanvas::VCanvas( TQWidget *parent, KarbonView* view, KarbonPart* part )
+    : TQScrollView( parent, "canvas", WStaticContents/*WNorthWestGravity*/ | WResizeNoErase  |
 	  WRepaintNoErase ), m_part( part ), m_view( view )
 {
 	connect(this, TQT_SIGNAL( contentsMoving( int, int ) ), this, TQT_SLOT( slotContentsMoving( int, int ) ) );
diff --git a/karbon/widgets/vcanvas.h b/karbon/widgets/vcanvas.h
index 61d9b6065..7fb38e77c 100644
--- a/karbon/widgets/vcanvas.h
+++ b/karbon/widgets/vcanvas.h
@@ -36,7 +36,7 @@ class KARBONCOMMON_EXPORT VCanvas : public TQScrollView
 	Q_OBJECT
   TQ_OBJECT
 public:
-	VCanvas( TQWidget *tqparent, KarbonView* view, KarbonPart* part );
+	VCanvas( TQWidget *parent, KarbonView* view, KarbonPart* part );
 	virtual ~VCanvas();
 
 	void repaintAll( const KoRect & );
diff --git a/karbon/widgets/vcolorslider.cc b/karbon/widgets/vcolorslider.cc
index e0c205558..3e2af4f02 100644
--- a/karbon/widgets/vcolorslider.cc
+++ b/karbon/widgets/vcolorslider.cc
@@ -27,16 +27,16 @@
 
 #include "vcolorslider.h"
 
-VColorSlider::VColorSlider( TQWidget* tqparent, const char* name )
-	: TQWidget( tqparent, name )
+VColorSlider::VColorSlider( TQWidget* parent, const char* name )
+	: TQWidget( parent, name )
 {
 	init();
 }
 
 // Label, left color, right color, min, max, value ...
 VColorSlider::VColorSlider( const TQString& label, const TQColor& col1,
-	const TQColor& col2, int min, int max, int value, TQWidget* tqparent, const char* name )
-		: TQWidget( tqparent, name )
+	const TQColor& col2, int min, int max, int value, TQWidget* parent, const char* name )
+		: TQWidget( parent, name )
 {
 	init();
 	setLabel( label );
diff --git a/karbon/widgets/vcolorslider.h b/karbon/widgets/vcolorslider.h
index dc3d659ad..80ca21b9b 100644
--- a/karbon/widgets/vcolorslider.h
+++ b/karbon/widgets/vcolorslider.h
@@ -40,10 +40,10 @@ public:
 	/**
 	 * Constructs a new color slider.
 	 *
-	 * @param tqparent the tqparent widget
+	 * @param parent the parent widget
 	 * @param name the slider's name
 	 */
-	VColorSlider( TQWidget* tqparent = 0L, const char* name = 0L );
+	VColorSlider( TQWidget* parent = 0L, const char* name = 0L );
 
 	/**
 	 * Constructs a new color slider.
@@ -54,11 +54,11 @@ public:
 	 * @param min the minimum value
 	 * @param max the maximum value
 	 * @param value the actual value
-	 * @param tqparent the tqparent widget
+	 * @param parent the parent widget
 	 * @param name the slider's name
 	 */
 	VColorSlider( const TQString& label, const TQColor& col1, const TQColor& col2,
-		int min, int max, int value, TQWidget* tqparent = 0L, const char* name = 0L );
+		int min, int max, int value, TQWidget* parent = 0L, const char* name = 0L );
 	
 	/** Destroys the color slider */
 	~VColorSlider();
diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc
index b8f955d8b..f65cfd74b 100644
--- a/karbon/widgets/vgradienttabwidget.cc
+++ b/karbon/widgets/vgradienttabwidget.cc
@@ -100,8 +100,8 @@ void VGradientListItem::paint( TQPainter* painter )
 	painter->flush();
 } // VGradientListItem::paint
 
-VGradientPreview::VGradientPreview( VGradient& gradient, double& opacity, TQWidget* tqparent, const char* name )
-		: TQWidget( tqparent, name ), m_gradient( &gradient ), m_opacity( &opacity )
+VGradientPreview::VGradientPreview( VGradient& gradient, double& opacity, TQWidget* parent, const char* name )
+		: TQWidget( parent, name ), m_gradient( &gradient ), m_opacity( &opacity )
 {
 	setBackgroundMode( TQt::NoBackground );
 	setMinimumSize( 70, 70 );
@@ -167,8 +167,8 @@ void VGradientPreview::paintEvent( TQPaintEvent* )
 	bitBlt( this, 0, 0, &pixmap, 0, 0, width(), height() );
 } // VGradientPreview::paintEvent
 
-VGradientTabWidget::VGradientTabWidget( VGradient& gradient, KarbonResourceServer* server, TQWidget* tqparent, const char* name )
-		: TQTabWidget( tqparent, name ), m_gradient( gradient ), m_resourceServer( server )
+VGradientTabWidget::VGradientTabWidget( VGradient& gradient, KarbonResourceServer* server, TQWidget* parent, const char* name )
+		: TQTabWidget( parent, name ), m_gradient( gradient ), m_resourceServer( server )
 {
 	setupUI();
 	setupConnections();
diff --git a/karbon/widgets/vgradienttabwidget.h b/karbon/widgets/vgradienttabwidget.h
index ba5f771f6..f0ac1d37f 100644
--- a/karbon/widgets/vgradienttabwidget.h
+++ b/karbon/widgets/vgradienttabwidget.h
@@ -64,7 +64,7 @@ private:
 class VGradientPreview : public TQWidget
 {
 	public:
-		VGradientPreview( VGradient& gradient, double& opacity, TQWidget* tqparent = 0L, const char* name = 0L );
+		VGradientPreview( VGradient& gradient, double& opacity, TQWidget* parent = 0L, const char* name = 0L );
 		~VGradientPreview();
 
 		virtual void paintEvent( TQPaintEvent* );
@@ -85,7 +85,7 @@ class KARBONBASE_EXPORT VGradientTabWidget : public TQTabWidget
 			FILL
 		};
 	
-		VGradientTabWidget( VGradient& gradient, KarbonResourceServer* server, TQWidget* tqparent = 0L, const char* name = 0L );
+		VGradientTabWidget( VGradient& gradient, KarbonResourceServer* server, TQWidget* parent = 0L, const char* name = 0L );
 		~VGradientTabWidget();
 
 		const VGradient& gradient();
diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc
index 49d7f0537..f1c55ea1c 100644
--- a/karbon/widgets/vgradientwidget.cc
+++ b/karbon/widgets/vgradientwidget.cc
@@ -54,8 +54,8 @@ static unsigned char colorStop_bits[] = {
    0x7c, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xff, 0x01
 };
 
-VGradientWidget::VGradientWidget( VGradient& gradient, TQWidget* tqparent, const char* name )
-		: TQWidget( tqparent, name ), m_gradient( &gradient )
+VGradientWidget::VGradientWidget( VGradient& gradient, TQWidget* parent, const char* name )
+		: TQWidget( parent, name ), m_gradient( &gradient )
 {
 	setBackgroundMode( TQt::NoBackground );
 	setMinimumSize( 105, 35 );
diff --git a/karbon/widgets/vgradientwidget.h b/karbon/widgets/vgradientwidget.h
index 236e98f9a..1c02d4829 100644
--- a/karbon/widgets/vgradientwidget.h
+++ b/karbon/widgets/vgradientwidget.h
@@ -32,7 +32,7 @@ class KARBONBASE_EXPORT VGradientWidget : public TQWidget
   TQ_OBJECT
 
 public:
-	VGradientWidget( VGradient& gradient, TQWidget* tqparent = 0L, const char* name = 0L );
+	VGradientWidget( VGradient& gradient, TQWidget* parent = 0L, const char* name = 0L );
 	~VGradientWidget();
 
 	virtual void paintEvent( TQPaintEvent* );
diff --git a/karbon/widgets/vreference.cc b/karbon/widgets/vreference.cc
index c7553fe87..f400fc139 100644
--- a/karbon/widgets/vreference.cc
+++ b/karbon/widgets/vreference.cc
@@ -26,7 +26,7 @@
 
 #include "vreference.h"
 
-VReference::VReference( TQWidget *tqparent, const char *name ) : TQFrame ( tqparent, name )
+VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, name )
 {
 	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
 	mButtonGroup = new TQButtonGroup (3,Qt::Vertical, this );
diff --git a/karbon/widgets/vreference.h b/karbon/widgets/vreference.h
index 261b61506..5ff89b48b 100644
--- a/karbon/widgets/vreference.h
+++ b/karbon/widgets/vreference.h
@@ -46,7 +46,7 @@ class VReference : public TQFrame
 	Q_OBJECT
   TQ_OBJECT
 public:
-	VReference( TQWidget *tqparent = 0L, const char *name = 0L );
+	VReference( TQWidget *parent = 0L, const char *name = 0L );
 	int referencePoint();
 public slots:
 	virtual void setReferencePoint ( int );
diff --git a/karbon/widgets/vruler.cc b/karbon/widgets/vruler.cc
index 28ed8939f..de03eb235 100644
--- a/karbon/widgets/vruler.cc
+++ b/karbon/widgets/vruler.cc
@@ -40,7 +40,7 @@ const char *VRuler::m_nums[] = {
     "XX   XXXXXX XXX     XXX   XXXXXX XXX    XXXX   XXXXX XXXXX   XXXX  XXX"
 };
 
-VRuler::VRuler(Qt::Orientation o, TQWidget *tqparent, const char *name) : super(tqparent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums)
+VRuler::VRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums)
 {
     setBackgroundMode(NoBackground);
     setFrameStyle(Box | Sunken);
diff --git a/karbon/widgets/vruler.h b/karbon/widgets/vruler.h
index 47458039f..fe538beab 100644
--- a/karbon/widgets/vruler.h
+++ b/karbon/widgets/vruler.h
@@ -36,7 +36,7 @@ class VRuler : public TQFrame {
     typedef TQFrame super;
 
 public:
-    VRuler(Qt::Orientation, TQWidget *tqparent = 0, const char *name = 0);
+    VRuler(Qt::Orientation, TQWidget *parent = 0, const char *name = 0);
     virtual ~VRuler();
 
 public:
diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc
index ab1b9261a..6e35d921f 100644
--- a/karbon/widgets/vsmallpreview.cc
+++ b/karbon/widgets/vsmallpreview.cc
@@ -39,8 +39,8 @@
 
 #define FRAMEWIDTH		40
 
-VSmallPreview::VSmallPreview( TQWidget* tqparent, const char* name )
-	: TQWidget( tqparent, name )
+VSmallPreview::VSmallPreview( TQWidget* parent, const char* name )
+	: TQWidget( parent, name )
 {
 	/* Create widget tqlayout */
 	TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 4 );
diff --git a/karbon/widgets/vsmallpreview.h b/karbon/widgets/vsmallpreview.h
index f264553d5..e666ad6a7 100644
--- a/karbon/widgets/vsmallpreview.h
+++ b/karbon/widgets/vsmallpreview.h
@@ -36,7 +36,7 @@ class VSmallPreview : public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	VSmallPreview( TQWidget* tqparent = 0L, const char* name = 0L );
+	VSmallPreview( TQWidget* parent = 0L, const char* name = 0L );
 	~VSmallPreview();
 
 	void update( const VStroke &, const VFill & );
diff --git a/karbon/widgets/vstatebutton.cc b/karbon/widgets/vstatebutton.cc
index 197cf0eea..1ea8e27a7 100644
--- a/karbon/widgets/vstatebutton.cc
+++ b/karbon/widgets/vstatebutton.cc
@@ -19,8 +19,8 @@
 
 #include "vstatebutton.h"
 
-VStateButton::VStateButton( TQWidget* tqparent, const char* name )
-		: TQPushButton( tqparent, name )
+VStateButton::VStateButton( TQWidget* parent, const char* name )
+		: TQPushButton( parent, name )
 {
 	m_index = 0;
 	m_pixmaps.setAutoDelete( true );
diff --git a/karbon/widgets/vstatebutton.h b/karbon/widgets/vstatebutton.h
index 08e4a1a28..a681dcc0f 100644
--- a/karbon/widgets/vstatebutton.h
+++ b/karbon/widgets/vstatebutton.h
@@ -27,7 +27,7 @@
 class VStateButton : public TQPushButton
 {
 public:
-	VStateButton( TQWidget* tqparent = 0L, const char* name = 0L );
+	VStateButton( TQWidget* parent = 0L, const char* name = 0L );
 	~VStateButton();
 
 	void addState( TQPixmap *state ) { m_pixmaps.append( state ); }
diff --git a/karbon/widgets/vstrokefillpreview.cc b/karbon/widgets/vstrokefillpreview.cc
index 93392d9b4..473ce4db3 100644
--- a/karbon/widgets/vstrokefillpreview.cc
+++ b/karbon/widgets/vstrokefillpreview.cc
@@ -52,8 +52,8 @@
 
 
 VStrokeFillPreview::VStrokeFillPreview(
-	KarbonPart *part, TQWidget* tqparent, const char* name )
-		: TQFrame( tqparent, name ), m_part( part )
+	KarbonPart *part, TQWidget* parent, const char* name )
+		: TQFrame( parent, name ), m_part( part )
 {
 	m_strokeWidget = false;
 	setFocusPolicy( TQ_NoFocus );
diff --git a/karbon/widgets/vstrokefillpreview.h b/karbon/widgets/vstrokefillpreview.h
index 81fdffaef..1790c9c9e 100644
--- a/karbon/widgets/vstrokefillpreview.h
+++ b/karbon/widgets/vstrokefillpreview.h
@@ -34,7 +34,7 @@ class VStrokeFillPreview : public TQFrame
   TQ_OBJECT
 
 public:
-	VStrokeFillPreview( KarbonPart *part, TQWidget* tqparent = 0L, const char* name = 0L );
+	VStrokeFillPreview( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L );
 	~VStrokeFillPreview();
 
 	virtual TQSize tqsizeHint() const
diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cc
index 37bfe811e..e13da6894 100644
--- a/karbon/widgets/vtranslate.cc
+++ b/karbon/widgets/vtranslate.cc
@@ -29,8 +29,8 @@
 
 #include "vtranslate.h"
 
-VTranslate::VTranslate( TQWidget* tqparent, const char* name )
-	: TQWidget( tqparent, name )
+VTranslate::VTranslate( TQWidget* parent, const char* name )
+	: TQWidget( parent, name )
 {
 	setCaption( i18n( "Translate" ) );
 
diff --git a/karbon/widgets/vtranslate.h b/karbon/widgets/vtranslate.h
index 1b019d4b8..7f07aadb5 100644
--- a/karbon/widgets/vtranslate.h
+++ b/karbon/widgets/vtranslate.h
@@ -35,7 +35,7 @@ class VTranslate : public TQWidget
   TQ_OBJECT
 
 public:
-	VTranslate( TQWidget* tqparent = 0L, const char* name = 0L );
+	VTranslate( TQWidget* parent = 0L, const char* name = 0L );
 	~VTranslate();
 
 public slots:
diff --git a/karbon/widgets/vtypebuttonbox.cc b/karbon/widgets/vtypebuttonbox.cc
index f182341dc..84b3ed14b 100644
--- a/karbon/widgets/vtypebuttonbox.cc
+++ b/karbon/widgets/vtypebuttonbox.cc
@@ -217,11 +217,11 @@ static const char* const buttonpattern[]={
 #include "vtypebuttonbox.h"
 
 VTypeButtonBox::VTypeButtonBox( KarbonPart *part, 
-								TQWidget* tqparent, const char* name )
-	: TQHButtonGroup( tqparent, name ),
+								TQWidget* parent, const char* name )
+	: TQHButtonGroup( parent, name ),
 	  m_part( part ), m_isStrokeManipulator( false )
 {
-	setMaximumWidth( tqparent->width() - 2 );
+	setMaximumWidth( parent->width() - 2 );
 
 	// The button for no fill
 	TQToolButton* button = new TQToolButton( this );
diff --git a/karbon/widgets/vtypebuttonbox.h b/karbon/widgets/vtypebuttonbox.h
index e033a3e43..4ee0dab30 100644
--- a/karbon/widgets/vtypebuttonbox.h
+++ b/karbon/widgets/vtypebuttonbox.h
@@ -37,7 +37,7 @@ public:
 		pattern  = 3
  	};
 
-	VTypeButtonBox( KarbonPart *part, TQWidget* tqparent = 0L, const char* name = 0L );
+	VTypeButtonBox( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L );
 	bool isStrokeManipulator() { return m_isStrokeManipulator; }
 
 public slots:
diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc
index 1330ee88c..38cfd8c2b 100644
--- a/kchart/csvimportdialog.cc
+++ b/kchart/csvimportdialog.cc
@@ -41,8 +41,8 @@
 #include <kcharsets.h>
 
 
-CSVImportDialog::CSVImportDialog(TQWidget* tqparent, TQByteArray& fileArray)
-    : KDialogBase(tqparent, 0, true, TQString(), Ok|Cancel, No, true),
+CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
+    : KDialogBase(parent, 0, true, TQString(), Ok|Cancel, No, true),
       m_dialog(new DialogUI(this)),
       m_adjustRows(false),
       m_adjustCols(false),
@@ -610,7 +610,7 @@ TQTextCodec* CSVImportDialog::getCodec(void) const
     {
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
-        // ### TODO: what tqparent to use?
+        // ### TODO: what parent to use?
         KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
diff --git a/kchart/csvimportdialog.h b/kchart/csvimportdialog.h
index d4a017268..80cd5375c 100644
--- a/kchart/csvimportdialog.h
+++ b/kchart/csvimportdialog.h
@@ -42,7 +42,7 @@ public:
         POINTNUMBER ///< Number, which decimal symbol is a point/dot
     };
 
-    CSVImportDialog(TQWidget* tqparent, TQByteArray& fileArray);
+    CSVImportDialog(TQWidget* parent, TQByteArray& fileArray);
     ~CSVImportDialog();
 
     bool     firstRowContainHeaders();
diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc
index 0f517ad61..c0d3d70ef 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.cc
+++ b/kchart/kchartBackgroundPixmapConfigPage.cc
@@ -46,8 +46,8 @@
 namespace KChart
 {
 
-KChartBackgroundPixmapConfigPage::KChartBackgroundPixmapConfigPage( KChartParams* params, TQWidget* tqparent )
-    : TQWidget( tqparent, "KChartBackgroundPixmapConfigPage" ),
+KChartBackgroundPixmapConfigPage::KChartBackgroundPixmapConfigPage( KChartParams* params, TQWidget* parent )
+    : TQWidget( parent, "KChartBackgroundPixmapConfigPage" ),
       _params( params )
 {
     TQWhatsThis::add( this,
diff --git a/kchart/kchartBackgroundPixmapConfigPage.h b/kchart/kchartBackgroundPixmapConfigPage.h
index 614396ea5..33350cf16 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.h
+++ b/kchart/kchartBackgroundPixmapConfigPage.h
@@ -43,7 +43,7 @@ class KChartBackgroundPixmapConfigPage : public TQWidget
 
 public:
     KChartBackgroundPixmapConfigPage( KChartParams* params,
-                                      TQWidget* tqparent );
+                                      TQWidget* parent );
     void init();
     void apply();
 
diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc
index 1ffdab286..d56668027 100644
--- a/kchart/kchartColorConfigPage.cc
+++ b/kchart/kchartColorConfigPage.cc
@@ -37,9 +37,9 @@ namespace KChart
 {
 
 KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
-                                              TQWidget* tqparent, 
+                                              TQWidget* parent, 
 					      KDChartTableData *dat ) :
-    TQWidget( tqparent ),
+    TQWidget( parent ),
     m_params( params ),
     m_data( dat ),
     index( 0 )
diff --git a/kchart/kchartColorConfigPage.h b/kchart/kchartColorConfigPage.h
index 0209b708f..ee95f8e83 100644
--- a/kchart/kchartColorConfigPage.h
+++ b/kchart/kchartColorConfigPage.h
@@ -44,7 +44,7 @@ class KChartColorConfigPage : public TQWidget
   TQ_OBJECT
 
 public:
-    KChartColorConfigPage( KChartParams* params, TQWidget* tqparent, KDChartTableData *dat );
+    KChartColorConfigPage( KChartParams* params, TQWidget* parent, KDChartTableData *dat );
     void apply();
 
     void setBackgroundColor( TQColor color );
diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc
index dc863a0fd..724535841 100644
--- a/kchart/kchartComboConfigPage.cc
+++ b/kchart/kchartComboConfigPage.cc
@@ -35,8 +35,8 @@ namespace KChart
 {
 
 KChartComboPage::KChartComboPage( KChartParams* params,
-                                  TQWidget* tqparent ) :
-    TQWidget( tqparent ),_params( params )
+                                  TQWidget* parent ) :
+    TQWidget( parent ),_params( params )
 {
     //TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 );
 
diff --git a/kchart/kchartComboConfigPage.h b/kchart/kchartComboConfigPage.h
index 91a6846fa..67b00c547 100644
--- a/kchart/kchartComboConfigPage.h
+++ b/kchart/kchartComboConfigPage.h
@@ -35,7 +35,7 @@ class KChartComboPage : public TQWidget
   TQ_OBJECT
 
 public:
-    KChartComboPage( KChartParams* params,TQWidget* tqparent );
+    KChartComboPage( KChartParams* params,TQWidget* parent );
     void init();
     void apply();
 
diff --git a/kchart/kchartConfigDialog.cc b/kchart/kchartConfigDialog.cc
index 4eadac396..d5c9a72ab 100644
--- a/kchart/kchartConfigDialog.cc
+++ b/kchart/kchartConfigDialog.cc
@@ -49,9 +49,9 @@ namespace KChart
 {
 
 KChartConfigDialog::KChartConfigDialog( KChartParams* params,
-					TQWidget* tqparent, int flags,
+					TQWidget* parent, int flags,
 					KDChartTableData *dat ) :
-    TQTabDialog( tqparent, "Chart config dialog", true ),
+    TQTabDialog( parent, "Chart config dialog", true ),
     m_params( params ),
 
     m_dataPage(0),
diff --git a/kchart/kchartConfigDialog.h b/kchart/kchartConfigDialog.h
index c74bf598d..3ffcad50c 100644
--- a/kchart/kchartConfigDialog.h
+++ b/kchart/kchartConfigDialog.h
@@ -74,7 +74,7 @@ public:
 
 
     KChartConfigDialog( KChartParams* params,
-                        TQWidget* tqparent, int flags,
+                        TQWidget* parent, int flags,
 			KDChartTableData *dat );
 
     void subtypePage();
diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc
index ff4de5c7e..3766903c3 100644
--- a/kchart/kchartDataConfigPage.cc
+++ b/kchart/kchartDataConfigPage.cc
@@ -53,9 +53,9 @@ namespace KChart
 {
 
 KChartDataConfigPage::KChartDataConfigPage( KChartParams* params,
-					    TQWidget* tqparent, 
+					    TQWidget* parent, 
 					    KDChartTableData *dat) 
-    : TQWidget( tqparent ), m_params( params ), data(dat),
+    : TQWidget( parent ), m_params( params ), data(dat),
       m_firstRowAsLabel(0), m_firstColAsLabel(0)
 {
     TQGridLayout *grid1 = new TQGridLayout(this, 4, 1, KDialog::marginHint(),
diff --git a/kchart/kchartDataConfigPage.h b/kchart/kchartDataConfigPage.h
index 77396fe54..b7b818aed 100644
--- a/kchart/kchartDataConfigPage.h
+++ b/kchart/kchartDataConfigPage.h
@@ -44,7 +44,7 @@ class KChartDataConfigPage : public TQWidget
   TQ_OBJECT
 
 public:
-    KChartDataConfigPage( KChartParams* params, TQWidget* tqparent,
+    KChartDataConfigPage( KChartParams* params, TQWidget* parent,
 			  KDChartTableData *dat);
     void init();
     void defaults();
diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc
index 1448343b5..db1ce1f31 100644
--- a/kchart/kchartDataEditor.cc
+++ b/kchart/kchartDataEditor.cc
@@ -33,8 +33,8 @@ namespace KChart
 // We don't provide very much generality, since this spinbox is used
 // here and here only.
 //
-kchartDataSpinBox::kchartDataSpinBox(TQWidget *tqparent)
-    : TQSpinBox(tqparent)
+kchartDataSpinBox::kchartDataSpinBox(TQWidget *parent)
+    : TQSpinBox(parent)
 {
     m_ignore = false;
 }
@@ -85,7 +85,7 @@ bool kchartDataSpinBox::eventFilter( TQObject *obj, TQEvent *ev )
         }
     }
  
-    // Pass the event on to the tqparent class.
+    // Pass the event on to the parent class.
     return TQSpinBox::eventFilter( obj, ev );
 }
 
@@ -96,8 +96,8 @@ bool kchartDataSpinBox::eventFilter( TQObject *obj, TQEvent *ev )
 
 // Used for the keyboard navigation
 //
-kchartDataTable::kchartDataTable(TQWidget *tqparent)
-    : TQTable(tqparent)
+kchartDataTable::kchartDataTable(TQWidget *parent)
+    : TQTable(parent)
 {
 }
 
@@ -163,8 +163,8 @@ bool kchartDataTable::eventFilter( TQObject *obj, TQEvent *ev )
 
 #define COLUMNWIDTH  80
 
-kchartDataEditor::kchartDataEditor(TQWidget* tqparent) :
-    KDialogBase(tqparent, "dataeditor", true, i18n("KChart Data Editor"), 
+kchartDataEditor::kchartDataEditor(TQWidget* parent) :
+    KDialogBase(parent, "dataeditor", true, i18n("KChart Data Editor"), 
 		KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply,
 		KDialogBase::Ok, true)
 {
@@ -678,9 +678,9 @@ void kchartDataEditor::insertRow()
 // Ask user to make sure that (s)he really wants to remove a row or
 // column.
 //
-static int askUserForConfirmation(TQWidget *tqparent)
+static int askUserForConfirmation(TQWidget *parent)
 {
-    return KMessageBox::warningContinueCancel(tqparent,
+    return KMessageBox::warningContinueCancel(parent,
         i18n("You are about to shrink the data table and remove some values. "
 	     "This will lead to loss of existing data in the table "
 	     "and/or the headers.\n\n"
diff --git a/kchart/kchartDataEditor.h b/kchart/kchartDataEditor.h
index 8b8d55358..5410fbbc8 100644
--- a/kchart/kchartDataEditor.h
+++ b/kchart/kchartDataEditor.h
@@ -94,7 +94,7 @@ class kchartDataEditor : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    kchartDataEditor(TQWidget* tqparent = 0);
+    kchartDataEditor(TQWidget* parent = 0);
     void setData(KChartParams *params, KDChartTableData *dat);
     void getData(KChartParams *params, KDChartTableData *dat);
     void setRowLabels(const TQStringList &rowLabels);
diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc
index 92b8450bc..eef71cb65 100644
--- a/kchart/kchartFontConfigPage.cc
+++ b/kchart/kchartFontConfigPage.cc
@@ -82,9 +82,9 @@ namespace KChart
 {
 
 KChartFontConfigPage::KChartFontConfigPage( KChartParams* params,
-                                            TQWidget* tqparent, 
+                                            TQWidget* parent, 
 					    KDChartTableData *dat) :
-    TQWidget( tqparent ), m_params( params ), data(dat)
+    TQWidget( parent ), m_params( params ), data(dat)
 {
     TQGridLayout *grid = new TQGridLayout(this,4,3,KDialog::marginHint(), KDialog::spacingHint());
 
diff --git a/kchart/kchartFontConfigPage.h b/kchart/kchartFontConfigPage.h
index 96f813950..7d503112d 100644
--- a/kchart/kchartFontConfigPage.h
+++ b/kchart/kchartFontConfigPage.h
@@ -42,7 +42,7 @@ class KChartFontConfigPage : public TQWidget
   TQ_OBJECT
 
 public:
-    KChartFontConfigPage( KChartParams* params,TQWidget* tqparent, 
+    KChartFontConfigPage( KChartParams* params,TQWidget* parent, 
 			  KDChartTableData *dat);
     void init();
     void apply();
diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc
index ad385f8b0..c097c381b 100644
--- a/kchart/kchartHeaderFooterConfigPage.cc
+++ b/kchart/kchartHeaderFooterConfigPage.cc
@@ -36,8 +36,8 @@ namespace KChart
 {
 
 KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params,
-                                                      TQWidget* tqparent ) :
-    TQWidget( tqparent ),_params( params )
+                                                      TQWidget* parent ) :
+    TQWidget( parent ),_params( params )
 {
     TQGridLayout* tqlayout = new TQGridLayout( this, 4, 3 );
     tqlayout->setSpacing( KDialog::spacingHint() );
diff --git a/kchart/kchartHeaderFooterConfigPage.h b/kchart/kchartHeaderFooterConfigPage.h
index bc4cad1ee..fddcfe4fa 100644
--- a/kchart/kchartHeaderFooterConfigPage.h
+++ b/kchart/kchartHeaderFooterConfigPage.h
@@ -37,7 +37,7 @@ class KChartHeaderFooterConfigPage : public TQWidget
   TQ_OBJECT
 
 public:
-    KChartHeaderFooterConfigPage( KChartParams* params, TQWidget* tqparent );
+    KChartHeaderFooterConfigPage( KChartParams* params, TQWidget* parent );
     void init();
     void apply();
 protected slots:
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index 34edaf83c..39d99963b 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cc
@@ -45,8 +45,8 @@ namespace KChart
 
 
 KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
-                                                TQWidget* tqparent ) :
-    TQWidget( tqparent ),_params( params )
+                                                TQWidget* parent ) :
+    TQWidget( parent ),_params( params )
 {
   //Layout for 4 blocks
   TQGridLayout* tqlayout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
diff --git a/kchart/kchartLegendConfigPage.h b/kchart/kchartLegendConfigPage.h
index fe4841840..8419baa81 100644
--- a/kchart/kchartLegendConfigPage.h
+++ b/kchart/kchartLegendConfigPage.h
@@ -43,7 +43,7 @@ class KChartLegendConfigPage : public TQWidget
 
 public:
     KChartLegendConfigPage( KChartParams* params,
-                                 TQWidget* tqparent );
+                                 TQWidget* parent );
     void init();
     void apply();
 public slots:
diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc
index f1d57971e..adf56a3d3 100644
--- a/kchart/kchartLine3dConfigPage.cc
+++ b/kchart/kchartLine3dConfigPage.cc
@@ -35,8 +35,8 @@ namespace KChart
 {
 
 KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params,
-                                                          TQWidget* tqparent ) :
-    TQWidget( tqparent ),_params( params )
+                                                          TQWidget* parent ) :
+    TQWidget( parent ),_params( params )
 {
   TQGridLayout *grid1 = new TQGridLayout(this,8,3,KDialog::marginHint(), KDialog::spacingHint());
 
diff --git a/kchart/kchartLine3dConfigPage.h b/kchart/kchartLine3dConfigPage.h
index 130cd5e95..9a5ff85ac 100644
--- a/kchart/kchartLine3dConfigPage.h
+++ b/kchart/kchartLine3dConfigPage.h
@@ -37,7 +37,7 @@ class KChartLine3dConfigPage : public TQWidget
 
 public:
     KChartLine3dConfigPage( KChartParams* params,
-                                 TQWidget* tqparent );
+                                 TQWidget* parent );
     void init();
     void apply();
 protected slots:
diff --git a/kchart/kchartPageLayout.cc b/kchart/kchartPageLayout.cc
index b678da7e0..8fd9c9d02 100644
--- a/kchart/kchartPageLayout.cc
+++ b/kchart/kchartPageLayout.cc
@@ -30,8 +30,8 @@
 namespace KChart
 {
 
-KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, TRUE,i18n("Page Layout"),KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 | KDialogBase::Apply , KDialogBase::Ok,true )
+KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, TRUE,i18n("Page Layout"),KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 | KDialogBase::Apply , KDialogBase::Ok,true )
 {
     params=_params;
 #if 0
diff --git a/kchart/kchartPageLayout.h b/kchart/kchartPageLayout.h
index 119b2a5d9..e054892fd 100644
--- a/kchart/kchartPageLayout.h
+++ b/kchart/kchartPageLayout.h
@@ -34,7 +34,7 @@ class KChartPageLayout : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KChartPageLayout( KChartParams* _params, TQWidget* tqparent, const char* name);
+    KChartPageLayout( KChartParams* _params, TQWidget* parent, const char* name);
 public slots:
     void slotOk();
     void slotApply();
diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc
index fa3a58626..760c97861 100644
--- a/kchart/kchartParameter3dConfigPage.cc
+++ b/kchart/kchartParameter3dConfigPage.cc
@@ -35,8 +35,8 @@ namespace KChart
 {
 
 KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
-                                                          TQWidget* tqparent ) :
-    TQWidget( tqparent ),m_params( params )
+                                                          TQWidget* parent ) :
+    TQWidget( parent ),m_params( params )
 {
   TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint());
 
diff --git a/kchart/kchartParameter3dConfigPage.h b/kchart/kchartParameter3dConfigPage.h
index 54888fe7c..a349f566f 100644
--- a/kchart/kchartParameter3dConfigPage.h
+++ b/kchart/kchartParameter3dConfigPage.h
@@ -38,7 +38,7 @@ class KChartParameter3dConfigPage : public TQWidget
 
 public:
     KChartParameter3dConfigPage( KChartParams* params,
-                                 TQWidget* tqparent );
+                                 TQWidget* parent );
     void init();
     void apply();
 
diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc
index 1b075d279..bffa30997 100644
--- a/kchart/kchartParameterConfigPage.cc
+++ b/kchart/kchartParameterConfigPage.cc
@@ -41,8 +41,8 @@ namespace KChart
 {
 
 KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params,
-                                                      TQWidget* tqparent ) :
-    TQWidget( tqparent ),_params( params )
+                                                      TQWidget* parent ) :
+    TQWidget( parent ),_params( params )
 {
     // toplevel tqlayout
     TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 );
diff --git a/kchart/kchartParameterConfigPage.h b/kchart/kchartParameterConfigPage.h
index afc448a11..da3eaba9d 100644
--- a/kchart/kchartParameterConfigPage.h
+++ b/kchart/kchartParameterConfigPage.h
@@ -39,7 +39,7 @@ class KChartParameterConfigPage : public TQWidget
   TQ_OBJECT
 
 public:
-    KChartParameterConfigPage( KChartParams* params, TQWidget* tqparent );
+    KChartParameterConfigPage( KChartParams* params, TQWidget* parent );
     void init();
     void apply();
 public slots:
diff --git a/kchart/kchartParameterPieConfigPage.cc b/kchart/kchartParameterPieConfigPage.cc
index b516c980b..632e46d14 100644
--- a/kchart/kchartParameterPieConfigPage.cc
+++ b/kchart/kchartParameterPieConfigPage.cc
@@ -42,8 +42,8 @@ namespace KChart
 {
 
 KChartParameterPieConfigPage::KChartParameterPieConfigPage( KChartParams* params,
-                                                            TQWidget* tqparent ) :
-    TQWidget( tqparent ),_params( params )
+                                                            TQWidget* parent ) :
+    TQWidget( parent ),_params( params )
 {
     TQVBoxLayout  *toplevel = new TQVBoxLayout( this, 10 );
     TQVBoxLayout  *grid1 = new TQVBoxLayout(this);
diff --git a/kchart/kchartParameterPieConfigPage.h b/kchart/kchartParameterPieConfigPage.h
index bcd08fee4..cbefaaa12 100644
--- a/kchart/kchartParameterPieConfigPage.h
+++ b/kchart/kchartParameterPieConfigPage.h
@@ -43,7 +43,7 @@ class KChartParameterPieConfigPage : public TQWidget
   TQ_OBJECT
 
 public:
-    KChartParameterPieConfigPage( KChartParams* params,TQWidget* tqparent );
+    KChartParameterPieConfigPage( KChartParams* params,TQWidget* parent );
     void init();
     void apply();
 
diff --git a/kchart/kchartParameterPolarConfigPage.cc b/kchart/kchartParameterPolarConfigPage.cc
index 08f470e2e..807cd54e5 100644
--- a/kchart/kchartParameterPolarConfigPage.cc
+++ b/kchart/kchartParameterPolarConfigPage.cc
@@ -42,8 +42,8 @@ namespace KChart
 {
 
 KChartParameterPolarConfigPage::KChartParameterPolarConfigPage( KChartParams* params,
-                                                            TQWidget* tqparent ) :
-    TQWidget( tqparent ),_params( params )
+                                                            TQWidget* parent ) :
+    TQWidget( parent ),_params( params )
 {
     TQVBoxLayout *grid1 = new TQVBoxLayout(this);
     TQVButtonGroup* gb = new TQVButtonGroup( i18n( "Parameter" ), this );
diff --git a/kchart/kchartParameterPolarConfigPage.h b/kchart/kchartParameterPolarConfigPage.h
index b3c84f0f5..e30d9c62f 100644
--- a/kchart/kchartParameterPolarConfigPage.h
+++ b/kchart/kchartParameterPolarConfigPage.h
@@ -39,7 +39,7 @@ class KChartParameterPolarConfigPage : public TQWidget
   TQ_OBJECT
 
 public:
-    KChartParameterPolarConfigPage( KChartParams* params,TQWidget* tqparent );
+    KChartParameterPolarConfigPage( KChartParams* params,TQWidget* parent );
     void init();
     void apply();
 private:
diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc
index 68738337a..9a71b9b1f 100644
--- a/kchart/kchartPieConfigPage.cc
+++ b/kchart/kchartPieConfigPage.cc
@@ -40,9 +40,9 @@ namespace KChart
 {
 
 KChartPieConfigPage::KChartPieConfigPage( KChartParams* params,
-                                          TQWidget* tqparent,
+                                          TQWidget* parent,
                                           KDChartTableData* data) :
-    TQWidget( tqparent ),_params( params )
+    TQWidget( parent ),_params( params )
 {
     //    col=_params->colPie;
     pos=-1;
diff --git a/kchart/kchartPieConfigPage.h b/kchart/kchartPieConfigPage.h
index 446276acd..82f043069 100644
--- a/kchart/kchartPieConfigPage.h
+++ b/kchart/kchartPieConfigPage.h
@@ -48,7 +48,7 @@ class KChartPieConfigPage : public TQWidget
   TQ_OBJECT
 
 public:
-    KChartPieConfigPage( KChartParams* params, TQWidget* tqparent, 
+    KChartPieConfigPage( KChartParams* params, TQWidget* parent, 
 			 KDChartTableData* data);
     void init();
     void apply();
diff --git a/kchart/kchartPrinterDlg.cc b/kchart/kchartPrinterDlg.cc
index f47288cf5..9bd898d6c 100644
--- a/kchart/kchartPrinterDlg.cc
+++ b/kchart/kchartPrinterDlg.cc
@@ -33,8 +33,8 @@
 namespace KChart
 {
 
- KChartPrinterDlg::KChartPrinterDlg( TQWidget *tqparent, const char *name )
-  : KPrintDialogPage( tqparent, name )
+ KChartPrinterDlg::KChartPrinterDlg( TQWidget *parent, const char *name )
+  : KPrintDialogPage( parent, name )
 {
   setTitle( i18n( "KChart Options" ) );
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
diff --git a/kchart/kchartPrinterDlg.h b/kchart/kchartPrinterDlg.h
index 49cecb6c3..40d03c221 100644
--- a/kchart/kchartPrinterDlg.h
+++ b/kchart/kchartPrinterDlg.h
@@ -35,7 +35,7 @@ class KChartPrinterDlg : public KPrintDialogPage
   TQ_OBJECT
   public:
 	/// Getting the common arguments.
-    KChartPrinterDlg( TQWidget *tqparent = 0, const char *name = 0 );
+    KChartPrinterDlg( TQWidget *parent = 0, const char *name = 0 );
 
 	/// Reimplemented.
     void getOptions( TQMap<TQString, TQString>& opts, bool include_def = false );
diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc
index 3ffaca797..13585d7a6 100644
--- a/kchart/kchartSubTypeChartPage.cc
+++ b/kchart/kchartSubTypeChartPage.cc
@@ -43,8 +43,8 @@ namespace KChart
 {
 
 KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params,
-                                                        TQWidget* tqparent ) :
-    KChartSubTypeChartPage(  params, tqparent )
+                                                        TQWidget* parent ) :
+    KChartSubTypeChartPage(  params, parent )
 {
     TQHBoxLayout* toplevel = new TQHBoxLayout( this, 10 );
     TQVButtonGroup* subtypeBG = new TQVButtonGroup( i18n( "Sub-type" ), this );
@@ -122,8 +122,8 @@ void KChartHiloSubTypeChartPage::apply()
 }
 
 KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params,
-                                                        TQWidget* tqparent ) :
-    KChartSubTypeChartPage(  params, tqparent )
+                                                        TQWidget* parent ) :
+    KChartSubTypeChartPage(  params, parent )
 {
     TQHBoxLayout* toplevel = new TQHBoxLayout( this, 10 );
     TQVButtonGroup* subtypeBG = new TQVButtonGroup( i18n( "Sub-type" ), this );
@@ -202,8 +202,8 @@ void KChartAreaSubTypeChartPage::apply()
 }
 
 KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params,
-                                                      TQWidget* tqparent ) :
-    KChartSubTypeChartPage( params, tqparent )
+                                                      TQWidget* parent ) :
+    KChartSubTypeChartPage( params, parent )
 {
     TQHBoxLayout* toplevel = new TQHBoxLayout( this, 10 );
     TQVBox       *left = new TQVBox( this );
@@ -296,8 +296,8 @@ void KChartBarSubTypeChartPage::apply()
 }
 
 KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params,
-                                                        TQWidget* tqparent ) :
-    KChartSubTypeChartPage(  params, tqparent )
+                                                        TQWidget* parent ) :
+    KChartSubTypeChartPage(  params, parent )
 {
     TQHBoxLayout* toplevel = new TQHBoxLayout( this, 10 );
     TQVButtonGroup* subtypeBG = new TQVButtonGroup( i18n( "Sub-type" ), this );
@@ -375,8 +375,8 @@ void KChartLineSubTypeChartPage::apply()
 }
 
 KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params,
-                                                        TQWidget* tqparent ) :
-    KChartSubTypeChartPage(  params, tqparent )
+                                                        TQWidget* parent ) :
+    KChartSubTypeChartPage(  params, parent )
 {
     TQHBoxLayout* toplevel = new TQHBoxLayout( this, 10 );
     TQVButtonGroup* subtypeBG = new TQVButtonGroup( i18n( "Sub-type" ), this );
diff --git a/kchart/kchartSubTypeChartPage.h b/kchart/kchartSubTypeChartPage.h
index 425dda509..93eade2c0 100644
--- a/kchart/kchartSubTypeChartPage.h
+++ b/kchart/kchartSubTypeChartPage.h
@@ -39,8 +39,8 @@ class KChartSubTypeChartPage : public TQWidget
   TQ_OBJECT
 
 public:
-    KChartSubTypeChartPage( KChartParams* params, TQWidget* tqparent ) :
-        TQWidget( tqparent ), m_params( params ) {}
+    KChartSubTypeChartPage( KChartParams* params, TQWidget* parent ) :
+        TQWidget( parent ), m_params( params ) {}
     virtual void init() = 0;
     virtual void apply() = 0;
 
@@ -55,7 +55,7 @@ class KChartLineSubTypeChartPage : public KChartSubTypeChartPage
 
 public:
     KChartLineSubTypeChartPage( KChartParams* params,
-                                TQWidget* tqparent );
+                                TQWidget* parent );
     virtual void init();
     virtual void apply();
 
@@ -77,7 +77,7 @@ class KChartAreaSubTypeChartPage : public KChartSubTypeChartPage
 
 public:
     KChartAreaSubTypeChartPage( KChartParams* params,
-                                TQWidget* tqparent );
+                                TQWidget* parent );
     virtual void init();
     virtual void apply();
 
@@ -97,7 +97,7 @@ class KChartBarSubTypeChartPage : public KChartSubTypeChartPage
   TQ_OBJECT
 
 public:
-    KChartBarSubTypeChartPage( KChartParams* params, TQWidget* tqparent );
+    KChartBarSubTypeChartPage( KChartParams* params, TQWidget* parent );
     virtual void init();
     virtual void apply();
 
@@ -120,7 +120,7 @@ class KChartHiloSubTypeChartPage : public KChartSubTypeChartPage
 
 public:
     KChartHiloSubTypeChartPage( KChartParams* params,
-                                TQWidget* tqparent );
+                                TQWidget* parent );
     virtual void init();
     virtual void apply();
 
@@ -141,7 +141,7 @@ class KChartPolarSubTypeChartPage : public KChartSubTypeChartPage
 
 public:
     KChartPolarSubTypeChartPage( KChartParams* params,
-                                TQWidget* tqparent );
+                                TQWidget* parent );
     virtual void init();
     virtual void apply();
 
diff --git a/kchart/kchartWizard.cc b/kchart/kchartWizard.cc
index 634aa447a..a2166f2eb 100644
--- a/kchart/kchartWizard.cc
+++ b/kchart/kchartWizard.cc
@@ -21,9 +21,9 @@
 namespace KChart
 {
 
-KChartWizard::KChartWizard ( KChartPart* _chart, TQWidget *tqparent, const char* name,
+KChartWizard::KChartWizard ( KChartPart* _chart, TQWidget *parent, const char* name,
                              bool modal, WFlags f ) :
-    KWizard( tqparent, name, modal, f ),
+    KWizard( parent, name, modal, f ),
     m_chart( _chart )
 {
     // First page: select the data range
diff --git a/kchart/kchartWizard.h b/kchart/kchartWizard.h
index 91dc310a6..90cd02dd0 100644
--- a/kchart/kchartWizard.h
+++ b/kchart/kchartWizard.h
@@ -22,7 +22,7 @@ class KChartWizard : public KWizard
     Q_OBJECT
   TQ_OBJECT
 public:
-    KChartWizard ( KChartPart* chart, TQWidget *tqparent, const char* name,
+    KChartWizard ( KChartPart* chart, TQWidget *parent, const char* name,
 		   bool modal = true, WFlags f = 0 );
     ~KChartWizard();
 
diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cc
index 8bab93f4a..396264d8f 100644
--- a/kchart/kchartWizardLabelsLegendPage.cc
+++ b/kchart/kchartWizardLabelsLegendPage.cc
@@ -17,8 +17,8 @@
 namespace KChart
 {
 
-KChartWizardLabelsLegendPage::KChartWizardLabelsLegendPage( TQWidget* tqparent, KChartPart* chart ) :
-    TQWidget( tqparent ),
+KChartWizardLabelsLegendPage::KChartWizardLabelsLegendPage( TQWidget* parent, KChartPart* chart ) :
+    TQWidget( parent ),
     _chart( chart )
 {
 #if 0
diff --git a/kchart/kchartWizardLabelsLegendPage.h b/kchart/kchartWizardLabelsLegendPage.h
index 8144ea3ee..173554c15 100644
--- a/kchart/kchartWizardLabelsLegendPage.h
+++ b/kchart/kchartWizardLabelsLegendPage.h
@@ -20,7 +20,7 @@ class KChartWizardLabelsLegendPage : public TQWidget
   TQ_OBJECT
 
 public:
-  KChartWizardLabelsLegendPage( TQWidget* tqparent, KChartPart* chart );
+  KChartWizardLabelsLegendPage( TQWidget* parent, KChartPart* chart );
   ~KChartWizardLabelsLegendPage();
 
 #if 0
diff --git a/kchart/kchartWizardSelectChartSubTypePage.cc b/kchart/kchartWizardSelectChartSubTypePage.cc
index 34751d1f4..74804042e 100644
--- a/kchart/kchartWizardSelectChartSubTypePage.cc
+++ b/kchart/kchartWizardSelectChartSubTypePage.cc
@@ -25,9 +25,9 @@
 namespace KChart
 {
 
-KChartWizardSelectChartSubTypePage::KChartWizardSelectChartSubTypePage( TQWidget* tqparent,
+KChartWizardSelectChartSubTypePage::KChartWizardSelectChartSubTypePage( TQWidget* parent,
                                                                         KChartPart* chart ) :
-  TQWidget( tqparent ),
+  TQWidget( parent ),
   m_chart( chart )
 {
     // FIXME: Use KChartPart::chartType() instead, when implemented.
diff --git a/kchart/kchartWizardSelectChartSubTypePage.h b/kchart/kchartWizardSelectChartSubTypePage.h
index 902876ef1..cba9c7796 100644
--- a/kchart/kchartWizardSelectChartSubTypePage.h
+++ b/kchart/kchartWizardSelectChartSubTypePage.h
@@ -19,7 +19,7 @@ class KChartWizardSelectChartSubTypePage : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  KChartWizardSelectChartSubTypePage( TQWidget* tqparent, KChartPart* chart );
+  KChartWizardSelectChartSubTypePage( TQWidget* parent, KChartPart* chart );
   void changeSubTypeName( KChartParams::ChartType _type);
 
   bool chartSubType;
diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cc
index ff2b8746c..9928c2dbf 100644
--- a/kchart/kchartWizardSelectChartTypePage.cc
+++ b/kchart/kchartWizardSelectChartTypePage.cc
@@ -18,8 +18,8 @@ namespace KChart
 {
 
 
-KChartButton::KChartButton(TQWidget *tqparent, const TQString & _text, const TQPixmap &_pixmap)
-  : TQVBox(tqparent)
+KChartButton::KChartButton(TQWidget *parent, const TQString & _text, const TQPixmap &_pixmap)
+  : TQVBox(parent)
 {
   // The button
   m_button = new TQPushButton(this);
@@ -40,9 +40,9 @@ KChartButton::~KChartButton()
 // ================================================================
 
 
-KChartWizardSelectChartTypePage::KChartWizardSelectChartTypePage( TQWidget* tqparent,
+KChartWizardSelectChartTypePage::KChartWizardSelectChartTypePage( TQWidget* parent,
                                                                   KChartPart* chart )
-  : TQWidget( tqparent ),
+  : TQWidget( parent ),
     m_chart( chart )
 {
     m_typeBG = new TQButtonGroup( this );
@@ -82,8 +82,8 @@ KChartWizardSelectChartTypePage::KChartWizardSelectChartTypePage( TQWidget* tqpa
     connect( m_typeBG, TQT_SIGNAL( clicked( int ) ),
 	     this, TQT_SLOT( chartTypeSelected( int ) ) );
 
-    ////  tqparent->resize( 425, 256 );
-    //     tqparent->resize(xstep*5+50, ystep*4 + 100);
+    ////  parent->resize( 425, 256 );
+    //     parent->resize(xstep*5+50, ystep*4 + 100);
 }
 
 
diff --git a/kchart/kchartWizardSelectChartTypePage.h b/kchart/kchartWizardSelectChartTypePage.h
index ce1055747..2fb8d6120 100644
--- a/kchart/kchartWizardSelectChartTypePage.h
+++ b/kchart/kchartWizardSelectChartTypePage.h
@@ -24,7 +24,7 @@ class KChartButton : public TQVBox
   Q_OBJECT
   TQ_OBJECT
   public:
-    KChartButton(TQWidget* tqparent, const TQString &, const TQPixmap &);
+    KChartButton(TQWidget* parent, const TQString &, const TQPixmap &);
     ~KChartButton();
 
     TQPushButton *button() const { return m_button;}
@@ -38,7 +38,7 @@ class KChartWizardSelectChartTypePage : public TQWidget
   TQ_OBJECT
 
 public:
-  KChartWizardSelectChartTypePage( TQWidget* tqparent, KChartPart* chart );
+  KChartWizardSelectChartTypePage( TQWidget* parent, KChartPart* chart );
 
 public slots:
   void  apply();
diff --git a/kchart/kchartWizardSelectDataFormatPage.cc b/kchart/kchartWizardSelectDataFormatPage.cc
index cae8fddd7..386062595 100644
--- a/kchart/kchartWizardSelectDataFormatPage.cc
+++ b/kchart/kchartWizardSelectDataFormatPage.cc
@@ -27,9 +27,9 @@
 namespace KChart
 {
 
-KChartWizardSelectDataFormatPage::KChartWizardSelectDataFormatPage( TQWidget* tqparent,
+KChartWizardSelectDataFormatPage::KChartWizardSelectDataFormatPage( TQWidget* parent,
                                                                         KChartPart* chart ) :
-  TQWidget( tqparent ),
+  TQWidget( parent ),
   m_chart( chart )
 {
     TQGridLayout *grid1 = new TQGridLayout(this, 6, 1, KDialog::marginHint(),
diff --git a/kchart/kchartWizardSelectDataFormatPage.h b/kchart/kchartWizardSelectDataFormatPage.h
index b40b350f7..1e03cff7b 100644
--- a/kchart/kchartWizardSelectDataFormatPage.h
+++ b/kchart/kchartWizardSelectDataFormatPage.h
@@ -21,7 +21,7 @@ class KChartWizardSelectDataFormatPage : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  KChartWizardSelectDataFormatPage( TQWidget* tqparent, KChartPart* chart );
+  KChartWizardSelectDataFormatPage( TQWidget* parent, KChartPart* chart );
 
   TQString  dataArea() const;
   void     setDataArea( const TQString &area );
diff --git a/kchart/kchartWizardSelectDataPage.cc b/kchart/kchartWizardSelectDataPage.cc
index 0a802975f..40dafc123 100644
--- a/kchart/kchartWizardSelectDataPage.cc
+++ b/kchart/kchartWizardSelectDataPage.cc
@@ -9,8 +9,8 @@
 namespace KChart
 {
 
-KChartWizardSelectDataPage::KChartWizardSelectDataPage( TQWidget* tqparent ) :
-  TQWidget( tqparent )
+KChartWizardSelectDataPage::KChartWizardSelectDataPage( TQWidget* parent ) :
+  TQWidget( parent )
 {
   rangeED = new TQLineEdit( this, "LineEdit_1" );
   rangeED->setGeometry( 10, 90, 380, 30 );
diff --git a/kchart/kchartWizardSelectDataPage.h b/kchart/kchartWizardSelectDataPage.h
index 6c073d63f..61b5fc578 100644
--- a/kchart/kchartWizardSelectDataPage.h
+++ b/kchart/kchartWizardSelectDataPage.h
@@ -13,7 +13,7 @@ class KChartWizardSelectDataPage : public TQWidget
 friend class KChartWizard;
 
 public:
-  KChartWizardSelectDataPage( TQWidget* tqparent );
+  KChartWizardSelectDataPage( TQWidget* parent );
 
 private:
   TQLineEdit* rangeED;
diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cc
index 3c48cbe9a..76be1f0de 100644
--- a/kchart/kchartWizardSetupAxesPage.cc
+++ b/kchart/kchartWizardSetupAxesPage.cc
@@ -24,9 +24,9 @@
 namespace KChart
 {
 
-KChartWizardSetupAxesPage::KChartWizardSetupAxesPage( TQWidget* tqparent,
+KChartWizardSetupAxesPage::KChartWizardSetupAxesPage( TQWidget* parent,
                                                       KChartPart* chart ) :
-    TQWidget( tqparent ),
+    TQWidget( parent ),
     _chart( chart )
 {
     chart3d=true;
diff --git a/kchart/kchartWizardSetupAxesPage.h b/kchart/kchartWizardSetupAxesPage.h
index a6b0823a8..7ab41719a 100644
--- a/kchart/kchartWizardSetupAxesPage.h
+++ b/kchart/kchartWizardSetupAxesPage.h
@@ -22,7 +22,7 @@ class KChartWizardSetupAxesPage : public TQWidget
   TQ_OBJECT
 
 public:
-  KChartWizardSetupAxesPage( TQWidget* tqparent, KChartPart* chart );
+  KChartWizardSetupAxesPage( TQWidget* parent, KChartPart* chart );
   ~KChartWizardSetupAxesPage();
   bool chart3d;
 public slots:
diff --git a/kchart/kchartWizardSetupDataPage.cc b/kchart/kchartWizardSetupDataPage.cc
index 61a0745af..b2ba26ac5 100644
--- a/kchart/kchartWizardSetupDataPage.cc
+++ b/kchart/kchartWizardSetupDataPage.cc
@@ -12,11 +12,11 @@
 namespace KChart
 {
 
-KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* tqparent,
+KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent,
                                                                                                           KChartPart* chart) :
-  TQWidget( tqparent ),
+  TQWidget( parent ),
   _chart( chart ),
-  _parent( (KChartWizard*)tqparent )
+  _parent( (KChartWizard*)parent )
 {
   TQButtonGroup* tmpTQGroupBox;
   tmpTQGroupBox = new TQButtonGroup( this, "GroupBox_1" );
@@ -84,7 +84,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* tqparent,
   preview->resize( tmpTQFrame->contentsRect().width(),
                                    tmpTQFrame->contentsRect().height() );
   */
-  //tqparent->resize( 400, 350 );
+  //parent->resize( 400, 350 );
 }
 
 
diff --git a/kchart/kchartWizardSetupDataPage.h b/kchart/kchartWizardSetupDataPage.h
index 2fc2aca40..ee6e5d46f 100644
--- a/kchart/kchartWizardSetupDataPage.h
+++ b/kchart/kchartWizardSetupDataPage.h
@@ -19,7 +19,7 @@ class KChartWizardSetupDataPage : public TQWidget
   TQ_OBJECT
 
 public:
-  KChartWizardSetupDataPage( TQWidget* tqparent, KChartPart* chart );
+  KChartWizardSetupDataPage( TQWidget* parent, KChartPart* chart );
   ~KChartWizardSetupDataPage();
   
 private slots:
diff --git a/kchart/kchart_factory.cc b/kchart/kchart_factory.cc
index 576be3bd2..7c3fb0e70 100644
--- a/kchart/kchart_factory.cc
+++ b/kchart/kchart_factory.cc
@@ -21,8 +21,8 @@ KInstance   *KChartFactory::s_global    = 0;
 KAboutData  *KChartFactory::s_aboutData = 0;
 
 
-KChartFactory::KChartFactory( TQObject* tqparent, const char* name )
-    : KoFactory( tqparent, name )
+KChartFactory::KChartFactory( TQObject* parent, const char* name )
+    : KoFactory( parent, name )
 {
     global();
 }
@@ -39,14 +39,14 @@ KChartFactory::~KChartFactory()
 
 KParts::Part* KChartFactory::createPartObject( TQWidget *parentWidget,
 					       const char *widgetName,
-					       TQObject* tqparent,
+					       TQObject* parent,
 					       const char* name,
 					       const char *classname,
 					       const TQStringList & )
 {
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    KChartPart *part = new KChartPart( parentWidget, widgetName, tqparent, name,
+    KChartPart *part = new KChartPart( parentWidget, widgetName, parent, name,
 				       !bWantKoDocument );
 
     if ( !bWantKoDocument )
diff --git a/kchart/kchart_factory.h b/kchart/kchart_factory.h
index 86767cfef..da36d4e3b 100644
--- a/kchart/kchart_factory.h
+++ b/kchart/kchart_factory.h
@@ -22,12 +22,12 @@ class KChartFactory : public KoFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    KChartFactory( TQObject* tqparent = 0, const char* name = 0 );
+    KChartFactory( TQObject* parent = 0, const char* name = 0 );
     virtual ~KChartFactory();
 
     virtual KParts::Part  *createPartObject( TQWidget* = 0, 
 					     const char * = 0,
-					     TQObject* tqparent = 0,
+					     TQObject* parent = 0,
 					     const char* name = 0,
 					     const char* classname = "KoDocument",
 					     const TQStringList &args = TQStringList() );
diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc
index a2728b6ba..f0fda2f07 100644
--- a/kchart/kchart_part.cc
+++ b/kchart/kchart_part.cc
@@ -51,9 +51,9 @@ namespace KChart
 {
 
 KChartPart::KChartPart( TQWidget *parentWidget, const char *widgetName,
-			TQObject* tqparent, const char* name,
+			TQObject* parent, const char* name,
 			bool singleViewMode )
-  : KoChart::Part( parentWidget, widgetName, tqparent, name, singleViewMode ),
+  : KoChart::Part( parentWidget, widgetName, parent, name, singleViewMode ),
     m_params( 0 ),
     m_parentWidget( parentWidget ),
     m_rowLabels(), m_colLabels()
@@ -240,9 +240,9 @@ void KChartPart::generateBarChartTemplate()
 }
 
 
-KoView* KChartPart::createViewInstance( TQWidget* tqparent, const char* name )
+KoView* KChartPart::createViewInstance( TQWidget* parent, const char* name )
 {
-    return new KChartView( this, tqparent, name );
+    return new KChartView( this, parent, name );
 }
 
 
@@ -2294,7 +2294,7 @@ void  KChartPart::slotModified()
 }
 
 
-bool KChartPart::showEmbedInitDialog(TQWidget* /*tqparent*/)
+bool KChartPart::showEmbedInitDialog(TQWidget* /*parent*/)
 {
   // Don't show an embed dialog
   return true;
diff --git a/kchart/kchart_part.h b/kchart/kchart_part.h
index 343a97f18..fb9a72ba3 100644
--- a/kchart/kchart_part.h
+++ b/kchart/kchart_part.h
@@ -27,7 +27,7 @@ class KCHART_EXPORT KChartPart : public KoChart::Part
 
 public:
     KChartPart( TQWidget *parentWidget = 0, const char *widgetName = 0,
-		TQObject* tqparent = 0, const char* name = 0,
+		TQObject* parent = 0, const char* name = 0,
 		bool singleViewMode = false );
     ~KChartPart();
 
@@ -84,7 +84,7 @@ public:
     // Functions that generate templates (not used yet):
     void  generateBarChartTemplate();
 
-    virtual bool showEmbedInitDialog(TQWidget* tqparent);
+    virtual bool showEmbedInitDialog(TQWidget* parent);
 
 public slots:
     void  slotModified();
@@ -94,7 +94,7 @@ signals:
     void docChanged();
 
 protected:
-    virtual KoView* createViewInstance( TQWidget* tqparent, const char* name );
+    virtual KoView* createViewInstance( TQWidget* parent, const char* name );
     bool  loadOldXML( const TQDomDocument& doc );
     bool  loadAuxiliary( const TQDomDocument& doc );
     bool  loadData( const TQDomDocument& doc, KDChartTableData& currentData );
diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc
index 358aecd88..5b1cc6b2c 100644
--- a/kchart/kchart_view.cc
+++ b/kchart/kchart_view.cc
@@ -49,8 +49,8 @@ namespace KChart
 {
 
 
-KChartView::KChartView( KChartPart* part, TQWidget* tqparent, const char* name )
-    : KoView( part, tqparent, name )
+KChartView::KChartView( KChartPart* part, TQWidget* parent, const char* name )
+    : KoView( part, parent, name )
 {
 
     // No flicker
diff --git a/kchart/kchart_view.h b/kchart/kchart_view.h
index 9828ffcac..eba4a62c7 100644
--- a/kchart/kchart_view.h
+++ b/kchart/kchart_view.h
@@ -27,7 +27,7 @@ class KChartView : public KoView
     Q_OBJECT
   TQ_OBJECT
 public:
-    KChartView( KChartPart* part, TQWidget* tqparent = 0, const char* name = 0 );
+    KChartView( KChartPart* part, TQWidget* parent = 0, const char* name = 0 );
     ~KChartView();
 
     void updateGuiTypeOfChart();
diff --git a/kchart/kdchart/KDChartCustomBox.cpp b/kchart/kdchart/KDChartCustomBox.cpp
index d500356db..9b4d78551 100644
--- a/kchart/kdchart/KDChartCustomBox.cpp
+++ b/kchart/kdchart/KDChartCustomBox.cpp
@@ -347,12 +347,12 @@ qDebug("pdWidth: %i    box myRect w: %i  h %i",pdWidth,myRect.width(),myRect.hei
 
 
 void KDChartCustomBox::createCustomBoxNode( TQDomDocument& document,
-        TQDomNode& tqparent,
+        TQDomNode& parent,
         const TQString& elementName,
         const KDChartCustomBox* custombox )
 {
     TQDomElement customBoxElement = document.createElement( elementName );
-    tqparent.appendChild( customBoxElement );
+    parent.appendChild( customBoxElement );
     KDXML::createIntNode( document, customBoxElement, "Rotation", custombox->_rotation );
     KDXML::createStringNode( document, customBoxElement, "ContentText",
             custombox->_content.text() );
diff --git a/kchart/kdchart/KDChartCustomBox.h b/kchart/kdchart/KDChartCustomBox.h
index 17b47822d..223920e43 100644
--- a/kchart/kdchart/KDChartCustomBox.h
+++ b/kchart/kdchart/KDChartCustomBox.h
@@ -368,12 +368,12 @@ public:
       in a DOM document.
 
       \param document the DOM document to which the node will belong
-      \param tqparent the tqparent node to which the new node will be appended
+      \param parent the parent node to which the new node will be appended
       \param elementName the name of the new node
       \param custombox the custom box to be represented
       */
     static void createCustomBoxNode( TQDomDocument& document,
-                                     TQDomNode& tqparent,
+                                     TQDomNode& parent,
                                      const TQString& elementName,
                                      const KDChartCustomBox* custombox );
 
diff --git a/kchart/kdchart/KDChartParams.h b/kchart/kdchart/KDChartParams.h
index 7ae8c27cb..16722694c 100644
--- a/kchart/kdchart/KDChartParams.h
+++ b/kchart/kdchart/KDChartParams.h
@@ -329,7 +329,7 @@ public:
 
 
         static void createFrameSettingsNode( TQDomDocument& document,
-                                             TQDomNode& tqparent,
+                                             TQDomNode& parent,
                                              const TQString& elementName,
                                              const KDChartFrameSettings* settings,
                                              uint areaId );
@@ -2418,18 +2418,18 @@ public:
     friend TQTextStream& operator>>( TQTextStream& s, KDChartParams& p );
 
 public slots:
-    static void createChartValueNode( TQDomDocument& doc, TQDomNode& tqparent,
+    static void createChartValueNode( TQDomDocument& doc, TQDomNode& parent,
                                       const TQString& elementName,
                                       const TQVariant& valY,
                                       const TQVariant& valX,
                                       const int& propID  );
-    static void createColorMapNode( TQDomDocument& doc, TQDomNode& tqparent,
+    static void createColorMapNode( TQDomDocument& doc, TQDomNode& parent,
                                     const TQString& elementName,
                                     const TQMap< uint, TQColor >& map );
-    static void createDoubleMapNode( TQDomDocument& doc, TQDomNode& tqparent,
+    static void createDoubleMapNode( TQDomDocument& doc, TQDomNode& parent,
                                      const TQString& elementName,
                                      const TQMap< int, double >& map );
-    static void createChartFontNode( TQDomDocument& doc, TQDomNode& tqparent,
+    static void createChartFontNode( TQDomDocument& doc, TQDomNode& parent,
                                      const TQString& elementName,
                                      const TQFont& font, bool useRelFont,
                                      int relFont,
diff --git a/kchart/kdchart/KDChartParams_frame.cpp b/kchart/kdchart/KDChartParams_frame.cpp
index 30aec04a7..2c8d92e94 100644
--- a/kchart/kdchart/KDChartParams_frame.cpp
+++ b/kchart/kdchart/KDChartParams_frame.cpp
@@ -248,18 +248,18 @@ bool KDChartParams::KDChartFrameSettings::readFrameSettingsNode( const TQDomElem
   object for use in a DOM document.
 
   \param document the DOM document to which the node will belong
-  \param tqparent the tqparent node to which the new node will be appended
+  \param parent the parent node to which the new node will be appended
   \param elementName the name of the new node
   \param settings the frame settings to be represented
   */
 void KDChartParams::KDChartFrameSettings::createFrameSettingsNode( TQDomDocument& document,
-        TQDomNode& tqparent,
+        TQDomNode& parent,
         const TQString& elementName,
         const KDChartParams::KDChartFrameSettings* settings,
         uint areaId )
 {
     TQDomElement frameSettingsElement = document.createElement( elementName );
-    tqparent.appendChild( frameSettingsElement );
+    parent.appendChild( frameSettingsElement );
     if( settings->_frame )
         KDFrame::createFrameNode( document, frameSettingsElement, "Frame",
                                   *settings->_frame );
diff --git a/kchart/kdchart/KDChartParams_io.cpp b/kchart/kdchart/KDChartParams_io.cpp
index 2feaf1792..4f17e6538 100644
--- a/kchart/kdchart/KDChartParams_io.cpp
+++ b/kchart/kdchart/KDChartParams_io.cpp
@@ -2247,17 +2247,17 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
   for use in a DOM document.
 
   \param doc the DOM document to which the node will belong
-  \param tqparent the tqparent node to which the new node will be appended
+  \param parent the parent node to which the new node will be appended
   \param elementName the name of the new node
   \param map the map of colors to be represented
   */
-void KDChartParams::createColorMapNode( TQDomDocument& doc, TQDomNode& tqparent,
+void KDChartParams::createColorMapNode( TQDomDocument& doc, TQDomNode& parent,
         const TQString& elementName,
         const TQMap< uint, TQColor >& map )
 {
     TQDomElement mapElement =
         doc.createElement( elementName );
-    tqparent.appendChild( mapElement );
+    parent.appendChild( mapElement );
     for( TQMap<uint,TQColor>::ConstIterator it = map.begin();
             it != map.end(); ++it ) {
         // Dataset element
@@ -2277,17 +2277,17 @@ void KDChartParams::createColorMapNode( TQDomDocument& doc, TQDomNode& tqparent,
   for use in a DOM document.
 
   \param doc the DOM document to which the node will belong
-  \param tqparent the tqparent node to which the new node will be appended
+  \param parent the parent node to which the new node will be appended
   \param elementName the name of the new node
   \param map the map of doubles to be represented
   */
-void KDChartParams::createDoubleMapNode( TQDomDocument& doc, TQDomNode& tqparent,
+void KDChartParams::createDoubleMapNode( TQDomDocument& doc, TQDomNode& parent,
         const TQString& elementName,
         const TQMap< int, double >& map )
 {
     TQDomElement mapElement =
         doc.createElement( elementName );
-    tqparent.appendChild( mapElement );
+    parent.appendChild( mapElement );
     for( TQMap<int,double>::ConstIterator it = map.begin();
             it != map.end(); ++it ) {
         // Dataset element
@@ -2321,18 +2321,18 @@ void dataCoordToElementAttr(const TQVariant& val, TQDomElement& element, const T
   chart value for use in a DOM document.
 
   \param doc the DOM document to which the node will belong
-  \param tqparent the tqparent node to which the new node will be appended
+  \param parent the parent node to which the new node will be appended
   \param elementName the name of the new node
   \param data the chart value to be represented
   */
-void KDChartParams::createChartValueNode( TQDomDocument& doc, TQDomNode& tqparent,
+void KDChartParams::createChartValueNode( TQDomDocument& doc, TQDomNode& parent,
         const TQString& elementName,
         const TQVariant& valY,
         const TQVariant& valX,
         const int& propID )
 {
     TQDomElement element = doc.createElement( elementName );
-    tqparent.appendChild( element );
+    parent.appendChild( element );
     dataCoordToElementAttr( valY, element, "" ); // no postfix for Y value: backwards compat.
     dataCoordToElementAttr( valX, element, "X" );
     element.setAttribute( "PropertySetID",
@@ -2346,7 +2346,7 @@ void KDChartParams::createChartValueNode( TQDomDocument& doc, TQDomNode& tqparen
   chart for use in a DOM document.
 
   \param doc the DOM document to which the node will belong
-  \param tqparent the tqparent node to which the new node will be appended
+  \param parent the parent node to which the new node will be appended
   \param elementName the name of the new node
   \param font the font to be resented
   \param useRelFont the specification whether the font size
@@ -2354,14 +2354,14 @@ void KDChartParams::createChartValueNode( TQDomDocument& doc, TQDomNode& tqparen
   \param relFont the relative font size
   \param minFont the minimal font size in points, leave this parameter out if not needed
   */
-void KDChartParams::createChartFontNode( TQDomDocument& doc, TQDomNode& tqparent,
+void KDChartParams::createChartFontNode( TQDomDocument& doc, TQDomNode& parent,
         const TQString& elementName,
         const TQFont& font, bool useRelFont,
         int relFont,
         int minFont )
 {
     TQDomElement chartFontElement = doc.createElement( elementName );
-    tqparent.appendChild( chartFontElement );
+    parent.appendChild( chartFontElement );
     KDXML::createFontNode( doc, chartFontElement, "Font", font );
     KDXML::createBoolNode( doc, chartFontElement, "UseRelFontSize",
             useRelFont );
@@ -2379,7 +2379,7 @@ void KDChartParams::createChartFontNode( TQDomDocument& doc, TQDomNode& tqparent
   for use in a DOM document.
 
   \param doc the DOM document to which the node will belong
-  \param tqparent the tqparent node to which the new node will be appended
+  \param parent the parent node to which the new node will be appended
   \param elementName the name of the new node
   \param map the color map to be represented
   */
diff --git a/kchart/kdchart/KDChartPropertySet.h b/kchart/kdchart/KDChartPropertySet.h
index a3e949530..cdd64f780 100644
--- a/kchart/kdchart/KDChartPropertySet.h
+++ b/kchart/kdchart/KDChartPropertySet.h
@@ -107,12 +107,12 @@ class KDCHART_EXPORT KDChartPropertySet :public TQObject
       This constructor may be used to initialize a property set
       and let it have all property IDs set to a specific value,
       e.g. you might pass KDCHART_PROPSET_NORMAL_DATA
-      as ID to make the default property set the tqparent of all
+      as ID to make the default property set the parent of all
       values.
 
       \param name (may be empty) a name describing this property set.
-      \param idParent the ID of the tqparent property set. Skip this paramter
-      to define a property set without specifying a tqparent.
+      \param idParent the ID of the parent property set. Skip this paramter
+      to define a property set without specifying a parent.
       */
     KDChartPropertySet( const TQString& name, int idParent=KDChartPropertySet::UndefinedID ) :
         mOwnID( UndefinedID )
diff --git a/kchart/kdchart/KDChartWidget.cpp b/kchart/kdchart/KDChartWidget.cpp
index c3e42b8ba..d530ea19e 100644
--- a/kchart/kdchart/KDChartWidget.cpp
+++ b/kchart/kdchart/KDChartWidget.cpp
@@ -65,12 +65,12 @@
   and setData before using this chart otherwise only a simple
   default bar chart will be shown.
 
-  \param tqparent the widget tqparent; passed on to TQWidget
+  \param parent the widget parent; passed on to TQWidget
   \param name the widget name; passed on to TQWidget
   */
 
-KDChartWidget::KDChartWidget( TQWidget* tqparent, const char* name ) :
-TQWidget( tqparent, name ),
+KDChartWidget::KDChartWidget( TQWidget* parent, const char* name ) :
+TQWidget( parent, name ),
     _params( 0 ),
     _data( 0 ),
     _activeData( false ),
@@ -87,14 +87,14 @@ _mousePressedOnRegion( 0 )
 
   \param params the specification of the chart
   \param data the data to be displayed as a chart
-  \param tqparent the widget tqparent; passed on to TQWidget
+  \param parent the widget parent; passed on to TQWidget
   \param name the widget name; passed on to TQWidget
   */
 
 KDChartWidget::KDChartWidget( KDChartParams* params,
         KDChartTableDataBase* data,
-        TQWidget* tqparent, const char* name ) :
-TQWidget( tqparent, name ),
+        TQWidget* parent, const char* name ) :
+TQWidget( parent, name ),
     _params( params ),
     _data( data ),
     _activeData( false ),
diff --git a/kchart/kdchart/KDChartWidget.h b/kchart/kdchart/KDChartWidget.h
index 635e0bd90..a68951d58 100644
--- a/kchart/kdchart/KDChartWidget.h
+++ b/kchart/kdchart/KDChartWidget.h
@@ -53,10 +53,10 @@ class KDCHART_EXPORT KDChartWidget : public TQWidget
     TQ_PROPERTY( bool doubleBuffered READ isDoubleBuffered WRITE setDoubleBuffered )
 
 public:
-    KDChartWidget( TQWidget* tqparent = 0, const char* name = 0 );
+    KDChartWidget( TQWidget* parent = 0, const char* name = 0 );
     KDChartWidget( KDChartParams* params,
                    KDChartTableDataBase* data,
-                   TQWidget* tqparent = 0, const char* name = 0 );
+                   TQWidget* parent = 0, const char* name = 0 );
     ~KDChartWidget();
 
 public slots:
diff --git a/kchart/kdchart/KDDrawText.cpp b/kchart/kdchart/KDDrawText.cpp
index a954a5bfd..70283da67 100644
--- a/kchart/kdchart/KDDrawText.cpp
+++ b/kchart/kdchart/KDDrawText.cpp
@@ -356,9 +356,9 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter,
                         TQt::AlignLeft + TQt::AlignTop );
 */
 
-            TQBitmap tqmask;
-            tqmask = pm;
-            pm.setMask( tqmask );
+            TQBitmap mask;
+            mask = pm;
+            pm.setMask( mask );
             TQWMatrix m;
             m.rotate( degrees );
             TQPixmap theRotatedPixmap = pm.xForm(m);
diff --git a/kchart/kdchart/KDFrame.cpp b/kchart/kdchart/KDFrame.cpp
index 23bdcc37d..3904bf168 100644
--- a/kchart/kdchart/KDFrame.cpp
+++ b/kchart/kdchart/KDFrame.cpp
@@ -404,12 +404,12 @@ void KDFrame::setSimpleFrame( SimpleFrame frame,
 }
 
 
-void KDFrame::createFrameNode( TQDomDocument& document, TQDomNode& tqparent,
+void KDFrame::createFrameNode( TQDomDocument& document, TQDomNode& parent,
         const TQString& elementName,
         const KDFrame& frame )
 {
     TQDomElement frameElement = document.createElement( elementName );
-    tqparent.appendChild( frameElement );
+    parent.appendChild( frameElement );
     KDXML::createIntNode( document, frameElement, "ShadowWidth",
             frame._shadowWidth );
     KDXML::createStringNode( document, frameElement, "CornerName",
@@ -442,12 +442,12 @@ void KDFrame::createFrameNode( TQDomDocument& document, TQDomNode& tqparent,
             frame._cornerBR );
 }
 
-void KDFrame::createFrameProfileNode( TQDomDocument& document, TQDomNode& tqparent,
+void KDFrame::createFrameProfileNode( TQDomDocument& document, TQDomNode& parent,
         const TQString& elementName,
         KDFrameProfile profile )
 {
     TQDomElement profileElement = document.createElement( elementName );
-    tqparent.appendChild( profileElement );
+    parent.appendChild( profileElement );
     for( const KDFrameProfileSection* section = profile.first(); section != 0;
             section = profile.next() )
         KDFrameProfileSection::createFrameProfileSectionNode( document,
@@ -458,12 +458,12 @@ void KDFrame::createFrameProfileNode( TQDomDocument& document, TQDomNode& tqpare
 
 
 void KDFrame::KDFrameCorner::createFrameCornerNode( TQDomDocument& document,
-        TQDomNode& tqparent,
+        TQDomNode& parent,
         const TQString& elementName,
         const KDFrameCorner& corner )
 {
     TQDomElement cornerElement = document.createElement( elementName );
-    tqparent.appendChild( cornerElement );
+    parent.appendChild( cornerElement );
     KDXML::createStringNode( document, cornerElement, "Style",
             KDFrame::cornerStyleToString( corner._style ) );
     KDXML::createIntNode( document, cornerElement, "Width",
diff --git a/kchart/kdchart/KDFrame.h b/kchart/kdchart/KDFrame.h
index be31597e7..78de8ffb2 100644
--- a/kchart/kdchart/KDFrame.h
+++ b/kchart/kdchart/KDFrame.h
@@ -516,13 +516,13 @@ public:
             in a DOM document.
 
             \param document the DOM document to which the node will belong
-            \param tqparent the tqparent node to which the new node will be appended
+            \param parent the parent node to which the new node will be appended
             \param elementName the name of the new node
             \param corner the corner to be represented
             \endif
             */
             static void createFrameCornerNode( TQDomDocument& document,
-                    TQDomNode& tqparent,
+                    TQDomNode& parent,
                     const TQString& elementName,
                     const KDFrameCorner& corner );
 
@@ -899,7 +899,7 @@ public:
     /**
     Default Constructor. Defines default values.
 
-    The constructor does *not* have a \c tqparent parameter since drawing
+    The constructor does *not* have a \c parent parameter since drawing
     of the frame is not done transparently but by (one or more) explicit
     calls of the frames paint() methode.  See explanation given there
     to learn about the why and how of this...
@@ -942,7 +942,7 @@ public:
 /*
     Constructor. Set up a frame by copying settings of another frame.
 
-    The constructor does *not* have a \c tqparent parameter since drawing
+    The constructor does *not* have a \c parent parameter since drawing
     of the frame is not done transparently but by (one or more) explicit
     calls of the frames paint() methode.  See explanation given there
     to learn about the why and how of this...
@@ -1011,11 +1011,11 @@ public:
     in a DOM document.
 
     \param document the DOM document to which the node will belong
-    \param tqparent the tqparent node to which the new node will be appended
+    \param parent the parent node to which the new node will be appended
     \param elementName the name of the new node
     \param frame the frame to be represented
     */
-    static void createFrameNode( TQDomDocument& document, TQDomNode& tqparent,
+    static void createFrameNode( TQDomDocument& document, TQDomNode& parent,
             const TQString& elementName,
             const KDFrame& frame );
 
@@ -1024,12 +1024,12 @@ public:
     in a DOM document.
 
     \param document the DOM document to which the node will belong
-    \param tqparent the tqparent node to which the new node will be appended
+    \param parent the parent node to which the new node will be appended
     \param elementName the name of the new node
     \param profile the profile to be represented
     */
     static void createFrameProfileNode( TQDomDocument& document,
-            TQDomNode& tqparent,
+            TQDomNode& parent,
             const TQString& elementName,
             KDFrameProfile profile );
 
diff --git a/kchart/kdchart/KDFrameProfileSection.cpp b/kchart/kdchart/KDFrameProfileSection.cpp
index 924e864b7..38c6fa456 100644
--- a/kchart/kdchart/KDFrameProfileSection.cpp
+++ b/kchart/kdchart/KDFrameProfileSection.cpp
@@ -36,13 +36,13 @@ KDFrameProfileSection::~KDFrameProfileSection()
 
 
 void KDFrameProfileSection::createFrameProfileSectionNode( TQDomDocument& document,
-        TQDomNode& tqparent,
+        TQDomNode& parent,
         const TQString& elementName,
         const KDFrameProfileSection* section )
 
 {
     TQDomElement sectionElement = document.createElement( elementName );
-    tqparent.appendChild( sectionElement );
+    parent.appendChild( sectionElement );
     KDXML::createStringNode( document, sectionElement, "Direction",
             KDFrameProfileSection::directionToString( section->_direction ) );
     KDXML::createStringNode( document, sectionElement, "Curvature",
diff --git a/kchart/kdchart/KDFrameProfileSection.h b/kchart/kdchart/KDFrameProfileSection.h
index 8ca011ec3..9fe38adf5 100644
--- a/kchart/kdchart/KDFrameProfileSection.h
+++ b/kchart/kdchart/KDFrameProfileSection.h
@@ -189,12 +189,12 @@ public:
     section for use in a DOM document.
 
     \param document the DOM document to which the node will belong
-    \param tqparent the tqparent node to which the new node will be appended
+    \param parent the parent node to which the new node will be appended
     \param elementName the name of the new node
     \param section the section to be represented
     */
     static void createFrameProfileSectionNode( TQDomDocument& document,
-            TQDomNode& tqparent,
+            TQDomNode& parent,
             const TQString& elementName,
             const KDFrameProfileSection* section );
 
diff --git a/kchart/kdchart/KDXMLTools.cpp b/kchart/kdchart/KDXMLTools.cpp
index bff4c720e..bf03b362c 100644
--- a/kchart/kdchart/KDXMLTools.cpp
+++ b/kchart/kdchart/KDXMLTools.cpp
@@ -33,24 +33,24 @@
 
 namespace KDXML {
 
-    void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, bool value )
     {
         TQDomElement newElement =
             doc.createElement( elementName );
-        tqparent.appendChild( newElement );
+        parent.appendChild( newElement );
         TQDomText elementContent =
             doc.createTextNode( value ? "true" : "false" );
         newElement.appendChild( elementContent );
     }
 
 
-    void createOrientationNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createOrientationNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, Qt::Orientation value )
     {
         TQDomElement newElement =
             doc.createElement( elementName );
-        tqparent.appendChild( newElement );
+        parent.appendChild( newElement );
         TQDomText elementContent =
             doc.createTextNode( (Qt::Vertical == value) ? "vertical" : "horizontal" );
         newElement.appendChild( elementContent );
@@ -58,59 +58,59 @@ namespace KDXML {
 
 
 
-    void createSizeNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createSizeNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQSize& value )
     {
         TQDomElement newElement =
             doc.createElement( elementName );
-        tqparent.appendChild( newElement );
+        parent.appendChild( newElement );
         newElement.setAttribute( "Width", value.width() );
         newElement.setAttribute( "Height", value.height() );
     }
 
 
-    void createIntNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createIntNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, int value )
     {
         TQDomElement newElement =
             doc.createElement( elementName );
-        tqparent.appendChild( newElement );
+        parent.appendChild( newElement );
         TQDomText elementContent =
             doc.createTextNode( TQString::number( value ) );
         newElement.appendChild( elementContent );
     }
 
 
-    void createDoubleNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createDoubleNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, double value )
     {
         TQDomElement newElement =
             doc.createElement( elementName );
-        tqparent.appendChild( newElement );
+        parent.appendChild( newElement );
         TQDomText elementContent =
             doc.createTextNode( TQString::number( value ) );
         newElement.appendChild( elementContent );
     }
 
 
-    void createStringNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createStringNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName,
             const TQString& text )
     {
         TQDomElement newElement =
             doc.createElement( elementName );
-        tqparent.appendChild( newElement );
+        parent.appendChild( newElement );
         TQDomText elementContent =
             doc.createTextNode( text );
         newElement.appendChild( elementContent );
     }
 
 
-    void createColorNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createColorNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQColor& color )
     {
         TQDomElement colorElement = doc.createElement( elementName );
-        tqparent.appendChild( colorElement );
+        parent.appendChild( colorElement );
         colorElement.setAttribute( "Red",
                 TQString::number( color.red() ) );
         colorElement.setAttribute( "Green",
@@ -120,12 +120,12 @@ namespace KDXML {
     }
 
 
-    void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createBrushNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQBrush& brush )
 
     {
         TQDomElement brushElement = doc.createElement( elementName );
-        tqparent.appendChild( brushElement );
+        parent.appendChild( brushElement );
         createColorNode( doc, brushElement, "Color", brush.color() );
         createStringNode( doc, brushElement, "Style",
                 KDXML::brushStyleToString( brush.style() ) );
@@ -134,11 +134,11 @@ namespace KDXML {
     }
 
 
-    void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createPixmapNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQPixmap& pixmap )
     {
         TQDomElement pixmapElement = doc.createElement( elementName );
-        tqparent.appendChild( pixmapElement );
+        parent.appendChild( pixmapElement );
 
         createStringNode( doc, pixmapElement, "Format", "XPM.GZ" );
         if( pixmap.isNull() ){
@@ -172,11 +172,11 @@ namespace KDXML {
     }
 
 
-    void createRectNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createRectNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQRect& rect )
     {
         TQDomElement rectElement = doc.createElement( elementName );
-        tqparent.appendChild( rectElement );
+        parent.appendChild( rectElement );
         TQDomElement xElement = doc.createElement( "X" );
         rectElement.appendChild( xElement );
         TQDomText xContent = doc.createTextNode( TQString::number( rect.x() ) );
@@ -196,7 +196,7 @@ namespace KDXML {
     }
 
 
-    void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent,
+    void createStringListNodes( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName,
             const TQStringList* list )
     {
@@ -206,18 +206,18 @@ namespace KDXML {
         for( TQStringList::ConstIterator it = list->begin();
                 it != list->end(); ++it ) {
             TQDomElement element = doc.createElement( elementName );
-            tqparent.appendChild( element );
+            parent.appendChild( element );
             TQDomText elementContent = doc.createTextNode( *it );
             element.appendChild( elementContent );
         }
     }
 
 
-    void createFontNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createFontNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQFont& font )
     {
         TQDomElement fontElement = doc.createElement( elementName );
-        tqparent.appendChild( fontElement );
+        parent.appendChild( fontElement );
         createStringNode( doc, fontElement, "Family", font.family() );
         createIntNode( doc, fontElement, "PointSize", font.pointSize() );
         createIntNode( doc, fontElement, "Weight", font.weight() );
@@ -229,44 +229,44 @@ namespace KDXML {
     }
 
 
-    void createPenNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createPenNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQPen& pen )
     {
         TQDomElement penElement = doc.createElement( elementName );
-        tqparent.appendChild( penElement );
+        parent.appendChild( penElement );
         createIntNode( doc, penElement, "Width", pen.width() );
         createColorNode( doc, penElement, "Color", pen.color() );
         createStringNode( doc, penElement, "Style", penStyleToString( pen.style() ) );
     }
 
 
-    void createDateTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createDateTimeNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, 
             const TQDateTime& datetime )
     {
         TQDomElement dateTimeElement = doc.createElement( elementName );
-        tqparent.appendChild( dateTimeElement );
+        parent.appendChild( dateTimeElement );
         createDateNode( doc, dateTimeElement, "Date", datetime.date() );
         createTimeNode( doc, dateTimeElement, "Time", datetime.time() );
     }
 
 
-    void createDateNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createDateNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQDate& date )
     {
         TQDomElement dateElement = doc.createElement( elementName );
-        tqparent.appendChild( dateElement );
+        parent.appendChild( dateElement );
         dateElement.setAttribute( "Year", TQString::number( date.year() ) );
         dateElement.setAttribute( "Month", TQString::number( date.month() ) );
         dateElement.setAttribute( "Day", TQString::number( date.day() ) );
     }
 
 
-    void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createTimeNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQTime& time )
     {
         TQDomElement timeElement = doc.createElement( elementName );
-        tqparent.appendChild( timeElement );
+        parent.appendChild( timeElement );
         timeElement.setAttribute( "Hour",
                 TQString::number( time.hour() ) );
         timeElement.setAttribute( "Minute",
diff --git a/kchart/kdchart/KDXMLTools.h b/kchart/kdchart/KDXMLTools.h
index c633fba2e..4ebe68727 100644
--- a/kchart/kdchart/KDXMLTools.h
+++ b/kchart/kdchart/KDXMLTools.h
@@ -49,41 +49,41 @@ namespace KDXML {
     TQString brushStyleToString( Qt::BrushStyle style );
     Qt::BrushStyle stringToBrushStyle( const TQString& style );
 
-    void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, bool value );
-    void createOrientationNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createOrientationNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, Qt::Orientation value );
-    void createSizeNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createSizeNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQSize& value );
-    void createIntNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createIntNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, int value );
-    void createDoubleNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createDoubleNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, double value );
-    void createStringNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createStringNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName,
             const TQString& text );
-    void createColorNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createColorNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQColor& color );
-    void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createBrushNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQBrush& brush );
-    void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createPixmapNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQPixmap& pixmap );
-    void createRectNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createRectNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQRect& rect );
-    void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent,
+    void createStringListNodes( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName,
             const TQStringList* thelist ); // PCH: This is required to avoid MSVC compiler warnings and errors.
-    void createFontNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createFontNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQFont& font );
 
-    void createPenNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createPenNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQPen& pen );
-    void createDateTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createDateTimeNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName,
             const TQDateTime& datetime );
-    void createDateNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createDateNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQDate& date );
-    void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createTimeNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQTime& time );
     bool readIntNode( const TQDomElement& element, int& value );
     bool readStringNode( const TQDomElement& element, TQString& value );
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index 90cdc18e3..b965be257 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -57,10 +57,10 @@ static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit ri
 
 
 KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
-				  KDGanttMinimizeSplitter *tqparent, const char * name )
-    : TQWidget( tqparent, name ), _activeButton( 0 ), _collapsed( false )
+				  KDGanttMinimizeSplitter *parent, const char * name )
+    : TQWidget( parent, name ), _activeButton( 0 ), _collapsed( false )
 {
-    s = tqparent;
+    s = parent;
     setOrientation(o);
     setMouseTracking( true );
 }
@@ -326,7 +326,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
   To show a TQListBox, a TQListView and a TQTextEdit side by side:
 
   \code
-    KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( tqparent );
+    KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( parent );
     TQListBox *lb = new TQListBox( split );
     TQListView *lv = new TQListView( split );
     TQTextEdit *ed = new TQTextEdit( split );
@@ -379,22 +379,22 @@ static TQSize minSizeHint( const TQWidget* w )
 
 
 /*!
-  Constructs a horizontal splitter with the \a tqparent and \a
+  Constructs a horizontal splitter with the \a parent and \a
   name arguments being passed on to the TQFrame constructor.
 */
-KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *tqparent, const char *name )
-    :TQFrame(tqparent,name,WPaintUnclipped)
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *parent, const char *name )
+    :TQFrame(parent,name,WPaintUnclipped)
 {
      orient =Qt::Horizontal;
      init();
 }
 
 /*!
-  Constructs a splitter with orientation \a o with the \a tqparent
+  Constructs a splitter with orientation \a o with the \a parent
   and \a name arguments being passed on to the TQFrame constructor.
 */
-KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *tqparent, const char *name )
-    :TQFrame(tqparent,name,WPaintUnclipped)
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *parent, const char *name )
+    :TQFrame(parent,name,WPaintUnclipped)
 {
      orient = o;
      init();
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index 3ac0d0b77..43033abeb 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/kdgantt/KDGanttMinimizeSplitter.h
@@ -56,8 +56,8 @@ public:
     enum ResizeMode { Stretch, KeepSize, FollowSizeHint };
     enum Direction { Left, Right, Up, Down };
 
-    KDGanttMinimizeSplitter( TQWidget* tqparent=0, const char* name=0 );
-    KDGanttMinimizeSplitter( Qt::Orientation, TQWidget* tqparent=0, const char* name=0 );
+    KDGanttMinimizeSplitter( TQWidget* parent=0, const char* name=0 );
+    KDGanttMinimizeSplitter( Qt::Orientation, TQWidget* parent=0, const char* name=0 );
     ~KDGanttMinimizeSplitter();
 
     virtual void setOrientation( Qt::Orientation );
@@ -145,7 +145,7 @@ class KDGanttSplitterHandle : public TQWidget
   TQ_OBJECT
 public:
     KDGanttSplitterHandle( Qt::Orientation o,
-		       KDGanttMinimizeSplitter *tqparent, const char* name=0 );
+		       KDGanttMinimizeSplitter *parent, const char* name=0 );
     void setOrientation( Qt::Orientation o );
     Qt::Orientation orientation() const { return orient; }
 
diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp
index 1daa1409a..8bede0d04 100644
--- a/kdgantt/KDGanttSemiSizingControl.cpp
+++ b/kdgantt/KDGanttSemiSizingControl.cpp
@@ -57,15 +57,15 @@
   orientation and the control arrow button on top of the controlled
   widget.
 
-  \param tqparent the tqparent widget. This parameter is passed to the
+  \param parent the parent widget. This parameter is passed to the
   base class.
   \param name the internal widget name. This parameter is passed to
   the base class.
 */
 
-KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* tqparent,
+KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent,
                                           const char* name ) :
-    KDGanttSizingControl( tqparent, name ), _orient(Qt::Horizontal ), 
+    KDGanttSizingControl( parent, name ), _orient(Qt::Horizontal ), 
     _arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0)
 {
     init();
@@ -78,16 +78,16 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* tqparent,
   the controlled widget (depending on the orientation).
 
   \param orientation the orientation of the splitter
-  \param tqparent the tqparent widget. This parameter is passed to the
+  \param parent the parent widget. This parameter is passed to the
   base class.
   \param name the internal widget name. This parameter is passed to
   the base class.
 */
 
 KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation,
-                                          TQWidget* tqparent,
+                                          TQWidget* parent,
                                           const char* name ) :
-    KDGanttSizingControl( tqparent, name ), _orient( orientation ), 
+    KDGanttSizingControl( parent, name ), _orient( orientation ), 
     _arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0)
 {
     init();
@@ -101,7 +101,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation,
   \param arrowPosition specifies whether the control arrow button
   should appear before or after the controlled widget
   \param orientation the orientation of the splitter
-  \param tqparent the tqparent widget. This parameter is passed to the
+  \param parent the parent widget. This parameter is passed to the
   base class.
   \param name the internal widget name. This parameter is passed to
   the base class.
@@ -109,9 +109,9 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation,
 
 KDGanttSemiSizingControl::KDGanttSemiSizingControl( ArrowPosition arrowPosition,
                                           Qt::Orientation orientation,
-                                          TQWidget* tqparent,
+                                          TQWidget* parent,
                                           const char* name ) :
-    KDGanttSizingControl( tqparent, name ), _orient( orientation ), 
+    KDGanttSizingControl( parent, name ), _orient( orientation ), 
     _arrowPos( arrowPosition ), _minimizedWidget(0), _maximizedWidget(0)
 {
     init();
@@ -313,7 +313,7 @@ void KDGanttSemiSizingControl::setup()
      ************************************************** */
     // hack for the usage in KDGantt as pop-up legend widget
     // for this purpose,
-    // the _maximizedWidget must be a child of the tqparent of this widget
+    // the _maximizedWidget must be a child of the parent of this widget
 
     if ( isMinimized() ) {
        widget = _minimizedWidget;
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index 6e7fec6ac..34b11a234 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/kdgantt/KDGanttSemiSizingControl.h
@@ -50,11 +50,11 @@ class KDGanttSemiSizingControl : public KDGanttSizingControl
 public:
     enum ArrowPosition { Before, After };
 
-    KDGanttSemiSizingControl( TQWidget* tqparent = 0, const char* name = 0 );
-    KDGanttSemiSizingControl( Qt::Orientation orientation, TQWidget* tqparent = 0,
+    KDGanttSemiSizingControl( TQWidget* parent = 0, const char* name = 0 );
+    KDGanttSemiSizingControl( Qt::Orientation orientation, TQWidget* parent = 0,
                            const char* name = 0 );
     KDGanttSemiSizingControl( ArrowPosition arrowPosition,
-                         Qt::Orientation orientation, TQWidget* tqparent = 0,
+                         Qt::Orientation orientation, TQWidget* parent = 0,
                          const char* name = 0 );
 
     void setMinimizedWidget( TQWidget* widget );
diff --git a/kdgantt/KDGanttSizingControl.cpp b/kdgantt/KDGanttSizingControl.cpp
index a51f9f4fe..3d174ad57 100644
--- a/kdgantt/KDGanttSizingControl.cpp
+++ b/kdgantt/KDGanttSizingControl.cpp
@@ -48,7 +48,7 @@
 /*!
   Constructs an empty KDGanttSizing Control.
 
-  \param tqparent the tqparent widget. This parameter is passed to the
+  \param parent the parent widget. This parameter is passed to the
   base class.
   \param name the internal widget name. This parameter is passed to
   the base class.
@@ -56,8 +56,8 @@
 
 */
 
-KDGanttSizingControl::KDGanttSizingControl( TQWidget* tqparent, const char* name, WFlags f )
-    :TQWidget( tqparent, name, f ), _isMinimized( false )
+KDGanttSizingControl::KDGanttSizingControl( TQWidget* parent, const char* name, WFlags f )
+    :TQWidget( parent, name, f ), _isMinimized( false )
 {
 }
 
diff --git a/kdgantt/KDGanttSizingControl.h b/kdgantt/KDGanttSizingControl.h
index cbea0c58b..ffdb0fa7d 100644
--- a/kdgantt/KDGanttSizingControl.h
+++ b/kdgantt/KDGanttSizingControl.h
@@ -44,7 +44,7 @@ public:
     bool isMinimized() const;
     
 protected:
-    KDGanttSizingControl( TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 );
+    KDGanttSizingControl( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
 
 public slots:
     virtual void minimize( bool minimize );
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index 7f7e19838..d9bd17b5f 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -76,12 +76,12 @@
 /*!
   Constructs an empty KDGanttView.
 
-  \param tqparent the widget tqparent
+  \param parent the widget parent
   \param name the internal debugging name
 */
 
-KDGanttView::KDGanttView( TQWidget* tqparent, const char* name  )
-    : KDGanttMinimizeSplitter( Qt::Vertical, tqparent, name ),
+KDGanttView::KDGanttView( TQWidget* parent, const char* name  )
+    : KDGanttMinimizeSplitter( Qt::Vertical, parent, name ),
       myCanvasView(0),
       myTimeHeaderScroll(0)
 {
@@ -2343,7 +2343,7 @@ KDGanttViewItem* KDGanttView::firstChild() const
   GanttView as a calendar view, you have to call
   setDisplaySubitemsAsGroup( true ); to use the root items as calendar
   items.  To create new calendar entries for these root items, create
-  a new KDGanttViewTaskItem with this root item as a tqparent.  If you
+  a new KDGanttViewTaskItem with this root item as a parent.  If you
   want an item with subitems to behave like a calendar (which is
   possibly empty at startup), please call setIsCalendar( true ); for
   this item.
@@ -4539,7 +4539,7 @@ void  KDGanttView::lvStartDrag (KDGanttViewItem* item)
   // In order to avoid starting drags for particular items, subclass KDGanttView
   // an reimplement this method.
   // insert here some code like
-  // if ( item->tqparent() )
+  // if ( item->parent() )
   // return;
   // This particular code will make it impossible to drag other items but root items.
   if ( d->drag()  ) {
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 6498d9717..f736494e1 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -118,7 +118,7 @@ public:
     enum HourFormat { Hour_24, Hour_12, Hour_24_FourDigit };
     enum RepaintMode { No, Medium, Always };
 
-    KDGanttView( TQWidget* tqparent = 0, const char* name = 0 );
+    KDGanttView( TQWidget* parent = 0, const char* name = 0 );
     ~KDGanttView();
 
     virtual void show();
diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp
index 7d70a6e2c..30cdc29ba 100644
--- a/kdgantt/KDGanttViewEventItem.cpp
+++ b/kdgantt/KDGanttViewEventItem.cpp
@@ -64,15 +64,15 @@ KDGanttViewEventItem::KDGanttViewEventItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param tqparent a tqparent item under which this one goes
+  \param parent a parent item under which this one goes
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* tqparent,
+KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* parent,
                                             const TQString& lvtext,
                                             const TQString& name ) :
-    KDGanttViewItem( Event, tqparent, lvtext, name )
+    KDGanttViewItem( Event, parent, lvtext, name )
 {
  initItem();
 
@@ -102,17 +102,17 @@ KDGanttViewEventItem::KDGanttViewEventItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param tqparent a tqparent item under which this one goes
+  \param parent a parent item under which this one goes
   \param after another item at the same level behind which this one should go
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* tqparent,
+KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* parent,
                                             KDGanttViewItem* after,
                                             const TQString& lvtext,
                                             const TQString& name ) :
-    KDGanttViewItem( Event, tqparent, after, lvtext, name )
+    KDGanttViewItem( Event, parent, after, lvtext, name )
 {
 
   initItem();
diff --git a/kdgantt/KDGanttViewEventItem.h b/kdgantt/KDGanttViewEventItem.h
index 0ea9162c8..408eb8303 100644
--- a/kdgantt/KDGanttViewEventItem.h
+++ b/kdgantt/KDGanttViewEventItem.h
@@ -43,13 +43,13 @@ public:
     KDGanttViewEventItem( KDGanttView* view,
                           const TQString& lvtext = TQString(),
                          const TQString& name = TQString() );
-    KDGanttViewEventItem( KDGanttViewItem* tqparent,
+    KDGanttViewEventItem( KDGanttViewItem* parent,
                           const TQString& lvtext = TQString(),
                          const TQString& name = TQString() );
     KDGanttViewEventItem( KDGanttView* view, KDGanttViewItem* after,
                           const TQString& lvtext = TQString(),
                          const TQString& name = TQString() );
-    KDGanttViewEventItem( KDGanttViewItem* tqparent, KDGanttViewItem* after,
+    KDGanttViewEventItem( KDGanttViewItem* parent, KDGanttViewItem* after,
                           const TQString& lvtext = TQString(),
                          const TQString& name = TQString() );
     virtual ~KDGanttViewEventItem();
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index 90aff68a2..fab1b3bd0 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -148,10 +148,10 @@
   \a KDGanttView::setDisplaySubitemsAsGroup( true );
   Insert root items in the Gantt view.
   Insert items as tqchildren of these root item in the Gantt view.
-  You may use any item type as tqparent and child; there are no limitations.
+  You may use any item type as parent and child; there are no limitations.
   It is, however, recommended to use KDGanttViewTaskItems
   Actually, you may add child items to the tqchildren themselves.
-  Such a child behaves then like a tqparent.
+  Such a child behaves then like a parent.
   Now set the start/end time of the tqchildren to specify a time
   interval for these items.
 */
@@ -182,7 +182,7 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
   Constructs an empty Gantt item.
 
   \param type the type of the item to insert
-  \param parentItem a tqparent item under which this one goes
+  \param parentItem a parent item under which this one goes
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
@@ -224,7 +224,7 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
   Constructs an empty Gantt item.
 
   \param type the type of the item to insert
-  \param parentItem a tqparent item under which this one goes
+  \param parentItem a parent item under which this one goes
   \param after another item at the same level behind which this one should go
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
@@ -268,8 +268,8 @@ KDGanttViewItem::~KDGanttViewItem()
   if ( listView() ) {
       if ( isOpen() )
           setOpen( false );
-      if ( tqparent() )
-          tqparent()->takeItem( this );
+      if ( parent() )
+          parent()->takeItem( this );
       else
           myGanttView->myListView->takeItem( this );
       myGanttView->myTimeTable->updateMyContent();
@@ -463,9 +463,9 @@ void KDGanttViewItem::setDisplaySubitemsAsGroup( bool show )
   if ( !show && _displaySubitemsAsGroup)
     isVisibleInGanttView = true;
   _displaySubitemsAsGroup = show;
-  if ( tqparent() )
-    if ( tqparent()->isOpen() )
-	 tqparent()->setOpen( true );
+  if ( parent() )
+    if ( parent()->isOpen() )
+	 parent()->setOpen( true );
   if ( isOpen() )
     setOpen( true );
   updateCanvasItems();
@@ -1248,14 +1248,14 @@ KDGanttViewItem* KDGanttViewItem::nextSibling() const
 
 
 /*!
-  Returns the tqparent item of this item
+  Returns the parent item of this item
 
-  \return the tqparent item of this item, 0 if this item is a top-level
+  \return the parent item of this item, 0 if this item is a top-level
   item
 */
-KDGanttViewItem* KDGanttViewItem::tqparent() const
+KDGanttViewItem* KDGanttViewItem::parent() const
 {
-    return (KDGanttViewItem*)TQListViewItem::tqparent();
+    return (KDGanttViewItem*)TQListViewItem::parent();
 }
 
 
@@ -1672,22 +1672,22 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttView* view,
   Creates a KDGanttViewItem according to the specification in a DOM
   element.
 
-  \param tqparent the tqparent item under which the item will be inserted
+  \param parent the parent item under which the item will be inserted
   \param element the DOM element from which to read the specification
   \return the newly created element
 */
-KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparent,
+KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent,
                                                         TQDomElement& element )
 {
     TQString typeString = element.attribute( "Type" );
     Q_ASSERT( !typeString.isEmpty() );
     KDGanttViewItem* item;
     if( typeString == "Task" )
-        item = new KDGanttViewTaskItem( tqparent );
+        item = new KDGanttViewTaskItem( parent );
     else if( typeString == "Summary" )
-        item = new KDGanttViewSummaryItem( tqparent );
+        item = new KDGanttViewSummaryItem( parent );
     else if( typeString == "Event" )
-        item = new KDGanttViewEventItem( tqparent );
+        item = new KDGanttViewEventItem( parent );
     else {
         qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" );
         return 0;
@@ -1702,12 +1702,12 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparen
   Creates a KDGanttViewItem according to the specification in a DOM
   element.
 
-  \param tqparent the tqparent item under which the item will be inserted
+  \param parent the parent item under which the item will be inserted
   \param previous to item behind this one should appear
   \param element the DOM element from which to read the specification
   \return the newly created element
 */
-KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparent,
+KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent,
                                                         KDGanttViewItem* previous,
                                                         TQDomElement& element )
 {
@@ -1715,11 +1715,11 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparen
     Q_ASSERT( !typeString.isEmpty() );
     KDGanttViewItem* item;
     if( typeString == "Task" )
-        item = new KDGanttViewTaskItem( tqparent, previous );
+        item = new KDGanttViewTaskItem( parent, previous );
     else if( typeString == "Summary" )
-        item = new KDGanttViewSummaryItem( tqparent, previous );
+        item = new KDGanttViewSummaryItem( parent, previous );
     else if( typeString == "Event" )
-        item = new KDGanttViewEventItem( tqparent, previous );
+        item = new KDGanttViewEventItem( parent, previous );
     else {
         qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" );
         return 0;
@@ -2226,7 +2226,7 @@ void  KDGanttViewItem::paintBranches ( TQPainter* p, const TQColorGroup& cg,
 	int x_c = w/2;
 	int y_c = y+y_coord+ temp->height ()/2;
 	int y_ce ;
-	if ( temp->itemBelow() && temp->itemBelow()->tqparent() == this )
+	if ( temp->itemBelow() && temp->itemBelow()->parent() == this )
 	  y_ce =y+y_coord+ temp->height ();
 	else
 	  y_ce = y_c;
@@ -2253,11 +2253,11 @@ void  KDGanttViewItem::resetSubitemVisibility()
   if ( myGanttView->calendarMode() ) {
     // in calendarmode only items can be opened which have subitems which have subitems
     if ( ! temp ) {
-      if ( !tqparent() )
-	// has no tqparent, has no child : show!
+      if ( !parent() )
+	// has no parent, has no child : show!
 	setVisible( true );
       else
-	// has tqparent, has no child : hide!
+	// has parent, has no child : hide!
 	setVisible( false );
       return;
     }
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index c69f77c45..972aa4d63 100644
--- a/kdgantt/KDGanttViewItem.h
+++ b/kdgantt/KDGanttViewItem.h
@@ -65,13 +65,13 @@ protected:
     KDGanttViewItem( Type type, KDGanttView* view,
                      const TQString& lvtext = TQString(),
                      const TQString& name = TQString() );
-    KDGanttViewItem( Type type, KDGanttViewItem* tqparent,
+    KDGanttViewItem( Type type, KDGanttViewItem* parent,
                      const TQString& lvtext = TQString(),
                      const TQString& name = TQString() );
     KDGanttViewItem( Type type, KDGanttView* view, KDGanttViewItem* after,
                      const TQString& lvtext = TQString(),
                      const TQString& name = TQString() );
-    KDGanttViewItem( Type type, KDGanttViewItem* tqparent,
+    KDGanttViewItem( Type type, KDGanttViewItem* parent,
                      KDGanttViewItem* after,
                      const TQString& lvtext = TQString(),
                      const TQString& name = TQString() );
@@ -166,7 +166,7 @@ public:
 
     KDGanttViewItem* firstChild() const;
     KDGanttViewItem* nextSibling() const;
-    KDGanttViewItem* tqparent() const;
+    KDGanttViewItem* parent() const;
     KDGanttViewItem* itemAbove();
     KDGanttViewItem* itemBelow( bool includeDisabled = true );
     KDGanttViewItem* getChildByName( const TQString& name );
@@ -180,9 +180,9 @@ public:
     static KDGanttViewItem* createFromDomElement( KDGanttView* view,
                                                   KDGanttViewItem* previous,
                                                   TQDomElement& element );
-    static KDGanttViewItem* createFromDomElement( KDGanttViewItem* tqparent,
+    static KDGanttViewItem* createFromDomElement( KDGanttViewItem* parent,
                                                   TQDomElement& element );
-    static KDGanttViewItem* createFromDomElement( KDGanttViewItem* tqparent,
+    static KDGanttViewItem* createFromDomElement( KDGanttViewItem* parent,
                                                   KDGanttViewItem* previous,
                                                   TQDomElement& element );
 private:
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index 8dcd5c750..8acf172b0 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -58,8 +58,8 @@
 #include <kcalendarsystem.h>
 #include <kdebug.h>
 
-KDTimeTableWidget:: KDTimeTableWidget( TQWidget* tqparent,KDGanttView* myGantt)
-    : TQCanvas (TQT_TQOBJECT(tqparent))
+KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt)
+    : TQCanvas (TQT_TQOBJECT(parent))
 {
     myGanttView = myGantt;
     taskLinksVisible = true;
@@ -695,8 +695,8 @@ int KDTimeTableWidget::getCoordX( TQDateTime dt ) {
 /* ***************************************************************
    KDTimeHeaderWidget:: KDTimeHeaderWidget
    ***************************************************************** */
-KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* tqparent,KDGanttView* gant )
-    : TQWidget (tqparent)
+KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant )
+    : TQWidget (parent)
 {
     myToolTip = new KDTimeHeaderToolTip(this,this);
     mySizeHint = 0;
@@ -2549,10 +2549,10 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
 /* ***************************************************************
    KDLegendWidget:: KDLegendWidget
    ***************************************************************** */
-KDLegendWidget:: KDLegendWidget( TQWidget* tqparent,
+KDLegendWidget:: KDLegendWidget( TQWidget* parent,
                                  KDGanttMinimizeSplitter* legendParent ) :
     KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before,Qt::Vertical,
-                               tqparent)
+                               parent)
 {
     myLegendParent = legendParent;
     dock = 0;
@@ -2700,7 +2700,7 @@ bool KDLegendWidget::isShown ( )
 }
 
 
-KDListView::KDListView(TQWidget* tqparent, KDGanttView* gantView):TQListView (tqparent)
+KDListView::KDListView(TQWidget* parent, KDGanttView* gantView):TQListView (parent)
 {
     myGanttView = gantView;
     setAcceptDrops(true);
@@ -3003,13 +3003,13 @@ void KDListView::dragMoveEvent ( TQDragMoveEvent * e)
     }
     if ( e->source() == myGanttView && gItem ){
         // internal drag - do not allow to drag the item to a subitem of itself
-        KDGanttViewItem* pItem = gItem->tqparent();
+        KDGanttViewItem* pItem = gItem->parent();
         while ( pItem ) {
             if ( pItem == myGanttView->myCanvasView->lastClickedItem ) {
                 e->accept( false );
                 return;
             }
-            pItem = pItem->tqparent();
+            pItem = pItem->parent();
         }
         if ( gItem == myGanttView->myCanvasView->lastClickedItem ) {
             e->accept( false );
@@ -3164,8 +3164,8 @@ KDCanvasRectangle::KDCanvasRectangle( KDTimeTableWidget* canvas,
 
 
 
-KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWidget* tqparent,  const
-    char* name ) : TQCanvasView ( canvas, tqparent, name ), scrollBarTimer( 0, "scrollBarTimer" )
+KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWidget* parent,  const
+    char* name ) : TQCanvasView ( canvas, parent, name ), scrollBarTimer( 0, "scrollBarTimer" )
 {
     setHScrollBarMode (TQScrollView::AlwaysOn );
     setVScrollBarMode( TQScrollView::AlwaysOn );
@@ -3320,20 +3320,20 @@ void  KDGanttCanvasView::insertItemAsRoot( KDGanttViewItem* item )
     if ( item == cuttedItem )
         cuttedItem = 0;
 }
-void  KDGanttCanvasView::insertItemAsChild( KDGanttViewItem* tqparent, KDGanttViewItem* item )
+void  KDGanttCanvasView::insertItemAsChild( KDGanttViewItem* parent, KDGanttViewItem* item )
 {
-    tqparent->insertItem( cuttedItem );
+    parent->insertItem( cuttedItem );
     if ( item == cuttedItem )
         cuttedItem = 0;
 }
-void  KDGanttCanvasView::insertItemAfter( KDGanttViewItem* tqparent , KDGanttViewItem* item )
+void  KDGanttCanvasView::insertItemAfter( KDGanttViewItem* parent , KDGanttViewItem* item )
 {
-    if ( tqparent->tqparent() ) {
-        tqparent->tqparent()->insertItem( item );
+    if ( parent->parent() ) {
+        parent->parent()->insertItem( item );
     }
     else
         mySignalSender->myListView->insertItem( item );
-    item->moveItem( tqparent );
+    item->moveItem( parent );
     if ( item == cuttedItem )
         cuttedItem = 0;
 }
@@ -3341,9 +3341,9 @@ void  KDGanttCanvasView::insertItemAfter( KDGanttViewItem* tqparent , KDGanttVie
 void  KDGanttCanvasView::cutItem()
 {
     lastClickedItem->hideSubtree();
-    //qDebug("last clicked %d tqparent %d ", lastClickedItem  , lastClickedItem->tqparent());
-    if ( lastClickedItem->tqparent() )
-        lastClickedItem->tqparent()->takeItem(lastClickedItem);
+    //qDebug("last clicked %d parent %d ", lastClickedItem  , lastClickedItem->parent());
+    if ( lastClickedItem->parent() )
+        lastClickedItem->parent()->takeItem(lastClickedItem);
     else
         mySignalSender->myListView->takeItem( lastClickedItem );
     mySignalSender->myTimeTable->updateMyContent();
@@ -3379,8 +3379,8 @@ void  KDGanttCanvasView::pasteItem( int type )
         lastClickedItem->insertItem( cuttedItem );
         break;
     case 2://after
-        if ( lastClickedItem->tqparent() ) {
-            lastClickedItem->tqparent()->insertItem( cuttedItem );
+        if ( lastClickedItem->parent() ) {
+            lastClickedItem->parent()->insertItem( cuttedItem );
         }
         else
             mySignalSender->myListView->insertItem( cuttedItem );
@@ -3427,20 +3427,20 @@ void  KDGanttCanvasView::newChildItem( int type )
         temp = new KDGanttViewTaskItem( lastClickedItem, i18n( "New Task" ) );
         break;
     case 5:
-        if ( lastClickedItem->tqparent() )
-            temp = new KDGanttViewEventItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Event" ) );
+        if ( lastClickedItem->parent() )
+            temp = new KDGanttViewEventItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Event" ) );
         else
             temp = new KDGanttViewEventItem( mySignalSender, lastClickedItem, i18n( "New Event" ) );
         break;
     case 4:
-        if ( lastClickedItem->tqparent() )
-            temp = new KDGanttViewSummaryItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Summary" ) );
+        if ( lastClickedItem->parent() )
+            temp = new KDGanttViewSummaryItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Summary" ) );
         else
             temp = new KDGanttViewSummaryItem( mySignalSender, lastClickedItem, i18n( "New Summary" ) );
         break;
     case 6:
-        if ( lastClickedItem->tqparent() )
-            temp = new KDGanttViewTaskItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Task" ) );
+        if ( lastClickedItem->parent() )
+            temp = new KDGanttViewTaskItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Task" ) );
         else
             temp = new KDGanttViewTaskItem( mySignalSender, lastClickedItem, i18n( "New Task" ) );
         break;
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index e920944d5..bad3c16b1 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -98,7 +98,7 @@ public:
      enum HourFormat { Hour_24, Hour_12 };
    */
 
-   KDTimeHeaderWidget (TQWidget* tqparent,KDGanttView* gant);
+   KDTimeHeaderWidget (TQWidget* parent,KDGanttView* gant);
   ~KDTimeHeaderWidget();
 
    TQString getToolTipText(TQPoint p);
@@ -251,7 +251,7 @@ class KDTimeTableWidget : public TQCanvas
   TQ_OBJECT
 
 public:
-   KDTimeTableWidget (TQWidget* tqparent,KDGanttView* my);
+   KDTimeTableWidget (TQWidget* parent,KDGanttView* my);
 
     void setBlockUpdating( bool block = true );
     bool blockUpdating();
@@ -328,7 +328,7 @@ class KDLegendWidget : public KDGanttSemiSizingControl
   TQ_OBJECT
 
 public:
-  KDLegendWidget ( TQWidget* tqparent, KDGanttMinimizeSplitter* legendParent );
+  KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent );
   void showMe(bool);
   bool isShown();
   void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
@@ -355,7 +355,7 @@ class KDListView : public TQListView
   TQ_OBJECT
 
 public:
-   KDListView (TQWidget* tqparent,KDGanttView* gv );
+   KDListView (TQWidget* parent,KDGanttView* gv );
    KDGanttView* myGanttView;
    void drawToPainter( TQPainter *p, bool drawHeader=false );
    void setCalendarMode( bool mode );
@@ -457,7 +457,7 @@ class KDGanttCanvasView : public TQCanvasView
   TQ_OBJECT
 
 public:
-    KDGanttCanvasView(KDGanttView* sender, TQCanvas* canvas = 0, TQWidget* tqparent = 0, const char* name = 0 );
+    KDGanttCanvasView(KDGanttView* sender, TQCanvas* canvas = 0, TQWidget* parent = 0, const char* name = 0 );
     ~KDGanttCanvasView();
     TQString getToolTipText(TQPoint p);
     TQString getWhatsThisText(TQPoint p);
diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp
index a190864d7..a2cf28f30 100644
--- a/kdgantt/KDGanttViewSummaryItem.cpp
+++ b/kdgantt/KDGanttViewSummaryItem.cpp
@@ -65,15 +65,15 @@ KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param tqparent a tqparent item under which this one goes
+  \param parent a parent item under which this one goes
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* tqparent,
+KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* parent,
                                                 const TQString& lvtext,
                                                 const TQString& name ) :
-    KDGanttViewItem( Summary, tqparent, lvtext, name )
+    KDGanttViewItem( Summary, parent, lvtext, name )
 {
   initItem();
 }
@@ -101,17 +101,17 @@ KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param tqparent a tqparent item under which this one goes
+  \param parent a parent item under which this one goes
   \param after another item at the same level behind which this one should go
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* tqparent,
+KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* parent,
                                                 KDGanttViewItem* after,
                                                 const TQString& lvtext,
                                                 const TQString& name ) :
-    KDGanttViewItem( Summary, tqparent, after, lvtext, name )
+    KDGanttViewItem( Summary, parent, after, lvtext, name )
 {
 
   initItem();
@@ -272,7 +272,7 @@ void KDGanttViewSummaryItem::showItem( bool show, int coordY )
     hideMe();
     return;
   }
- if ( displaySubitemsAsGroup() && !tqparent() && !isOpen() ) {
+ if ( displaySubitemsAsGroup() && !parent() && !isOpen() ) {
     hideMe();
     return;
   }
diff --git a/kdgantt/KDGanttViewSummaryItem.h b/kdgantt/KDGanttViewSummaryItem.h
index 67d918dd3..0cacc1b77 100644
--- a/kdgantt/KDGanttViewSummaryItem.h
+++ b/kdgantt/KDGanttViewSummaryItem.h
@@ -43,13 +43,13 @@ public:
     KDGanttViewSummaryItem( KDGanttView* view,
                             const TQString& lvtext = TQString(),
                             const TQString& name = TQString() );
-    KDGanttViewSummaryItem( KDGanttViewItem* tqparent,
+    KDGanttViewSummaryItem( KDGanttViewItem* parent,
                             const TQString& lvtext = TQString(),
                             const TQString& name = TQString() );
     KDGanttViewSummaryItem( KDGanttView* view, KDGanttViewItem* after,
                             const TQString& lvtext = TQString(),
                             const TQString& name = TQString() );
-    KDGanttViewSummaryItem( KDGanttViewItem* tqparent, KDGanttViewItem* after,
+    KDGanttViewSummaryItem( KDGanttViewItem* parent, KDGanttViewItem* after,
                             const TQString& lvtext = TQString(),
                             const TQString& name = TQString() );
     virtual ~KDGanttViewSummaryItem();
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index c8be3d850..b51bcbd00 100644
--- a/kdgantt/KDGanttViewTaskItem.cpp
+++ b/kdgantt/KDGanttViewTaskItem.cpp
@@ -79,15 +79,15 @@ KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param tqparent a tqparent item under which this one goes
+  \param parent a parent item under which this one goes
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* tqparent,
+KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* parent,
                                           const TQString& lvtext,
                                           const TQString& name ) :
-    KDGanttViewItem( Task, tqparent, lvtext, name )
+    KDGanttViewItem( Task, parent, lvtext, name )
 {
   initItem();
 }
@@ -115,17 +115,17 @@ KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param tqparent a tqparent item under which this one goes
+  \param parent a parent item under which this one goes
   \param after another item at the same level behind which this one should go
   \param lvtext the text to show in the listview
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* tqparent,
+KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* parent,
                                           KDGanttViewItem* after,
                                           const TQString& lvtext,
                                           const TQString& name ) :
-    KDGanttViewItem( Task, tqparent, after, lvtext, name )
+    KDGanttViewItem( Task, parent, after, lvtext, name )
 {
   initItem();
 }
@@ -216,7 +216,7 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY)
   floatEndShape->setZ(startShape->z()+0.003); // less than textCanvas
   floatEndShape->hide();
   textCanvas->setZ( prio + 0.005 );
-  if ( displaySubitemsAsGroup() && !tqparent() && !isOpen() ) {
+  if ( displaySubitemsAsGroup() && !parent() && !isOpen() ) {
     hideMe();
     return;
   }
@@ -242,9 +242,9 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY)
   }
   int hei = height();
   if ( ! isVisible() ) {
-    KDGanttViewItem * par = tqparent();
+    KDGanttViewItem * par = parent();
     while ( par != 0 && !par->isVisible() )
-      par = par->tqparent();
+      par = par->parent();
     if ( par )
       hei = par->height();
   }
@@ -356,9 +356,9 @@ void KDGanttViewTaskItem::initItem()
 {
   isVisibleInGanttView = false;
 
-  if ( myGanttView->calendarMode() && tqparent() ) {
+  if ( myGanttView->calendarMode() && parent() ) {
     setVisible( false );
-    tqparent()->setVisible( true );
+    parent()->setVisible( true );
   } else
     showItem(true);
   //qDebug("initItem  %s %s", listViewText().latin1(),startShape->brush().color().name().latin1() );
diff --git a/kdgantt/KDGanttViewTaskItem.h b/kdgantt/KDGanttViewTaskItem.h
index c4a56c2f3..328211bcc 100644
--- a/kdgantt/KDGanttViewTaskItem.h
+++ b/kdgantt/KDGanttViewTaskItem.h
@@ -46,13 +46,13 @@ public:
     KDGanttViewTaskItem( KDGanttView* view,
                             const TQString& lvtext = TQString(),
                             const TQString& name = TQString() );
-    KDGanttViewTaskItem( KDGanttViewItem* tqparent,
+    KDGanttViewTaskItem( KDGanttViewItem* parent,
                             const TQString& lvtext = TQString(),
                             const TQString& name = TQString() );
     KDGanttViewTaskItem( KDGanttView* view, KDGanttViewItem* after,
                             const TQString& lvtext = TQString(),
                             const TQString& name = TQString() );
-    KDGanttViewTaskItem( KDGanttViewItem* tqparent, KDGanttViewItem* after,
+    KDGanttViewTaskItem( KDGanttViewItem* parent, KDGanttViewItem* after,
                             const TQString& lvtext = TQString(),
                             const TQString& name = TQString() );
     virtual ~KDGanttViewTaskItem();
diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp
index 287761743..aea239441 100644
--- a/kdgantt/KDGanttXMLTools.cpp
+++ b/kdgantt/KDGanttXMLTools.cpp
@@ -40,12 +40,12 @@
 
 namespace KDGanttXML {
 
-void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
                      const TQString& elementName, bool value )
 {
     TQDomElement newElement =
         doc.createElement( elementName );
-    tqparent.appendChild( newElement );
+    parent.appendChild( newElement );
     TQDomText elementContent =
         doc.createTextNode( value ? "true" : "false" );
     newElement.appendChild( elementContent );
@@ -53,59 +53,59 @@ void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
 
 
 
-void createSizeNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createSizeNode( TQDomDocument& doc, TQDomNode& parent,
                      const TQString& elementName, const TQSize& value )
 {
     TQDomElement newElement =
         doc.createElement( elementName );
-    tqparent.appendChild( newElement );
+    parent.appendChild( newElement );
     newElement.setAttribute( "Width", value.width() );
     newElement.setAttribute( "Height", value.height() );
 }
 
 
-void createIntNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createIntNode( TQDomDocument& doc, TQDomNode& parent,
                     const TQString& elementName, int value )
 {
     TQDomElement newElement =
         doc.createElement( elementName );
-    tqparent.appendChild( newElement );
+    parent.appendChild( newElement );
     TQDomText elementContent =
         doc.createTextNode( TQString::number( value ) );
     newElement.appendChild( elementContent );
 }
 
 
-void createDoubleNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createDoubleNode( TQDomDocument& doc, TQDomNode& parent,
                        const TQString& elementName, double value )
 {
     TQDomElement newElement =
         doc.createElement( elementName );
-    tqparent.appendChild( newElement );
+    parent.appendChild( newElement );
     TQDomText elementContent =
         doc.createTextNode( TQString::number( value ) );
     newElement.appendChild( elementContent );
 }
 
 
-void createStringNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createStringNode( TQDomDocument& doc, TQDomNode& parent,
                        const TQString& elementName,
                        const TQString& text )
 {
     TQDomElement newElement =
         doc.createElement( elementName );
-    tqparent.appendChild( newElement );
+    parent.appendChild( newElement );
     TQDomText elementContent =
         doc.createTextNode( text );
     newElement.appendChild( elementContent );
 }
 
 
-void createColorNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createColorNode( TQDomDocument& doc, TQDomNode& parent,
                       const TQString& elementName, const TQColor& color )
 {
     TQDomElement colorElement = doc.createElement( elementName );
-    tqparent.appendChild( colorElement );
+    parent.appendChild( colorElement );
     colorElement.setAttribute( "Red",
                                TQString::number( color.red() ) );
     colorElement.setAttribute( "Green",
@@ -115,12 +115,12 @@ void createColorNode( TQDomDocument& doc, TQDomNode& tqparent,
 }
 
 
-void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createBrushNode( TQDomDocument& doc, TQDomNode& parent,
                       const TQString& elementName, const TQBrush& brush )
 
 {
     TQDomElement brushElement = doc.createElement( elementName );
-    tqparent.appendChild( brushElement );
+    parent.appendChild( brushElement );
     createColorNode( doc, brushElement, "Color", brush.color() );
     createStringNode( doc, brushElement, "Style",
                       KDGanttXML::brushStyleToString( brush.style() ) );
@@ -129,11 +129,11 @@ void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent,
 }
 
 
-void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createPixmapNode( TQDomDocument& doc, TQDomNode& parent,
                        const TQString& elementName, const TQPixmap& pixmap )
 {
     TQDomElement pixmapElement = doc.createElement( elementName );
-    tqparent.appendChild( pixmapElement );
+    parent.appendChild( pixmapElement );
 
     // Convert the pixmap to an image, save that image to an in-memory
     // XPM representation and compress this representation. This
@@ -163,11 +163,11 @@ void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent,
 }
 
 
-void createRectNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createRectNode( TQDomDocument& doc, TQDomNode& parent,
                      const TQString& elementName, const TQRect& rect )
 {
     TQDomElement rectElement = doc.createElement( elementName );
-    tqparent.appendChild( rectElement );
+    parent.appendChild( rectElement );
     TQDomElement xElement = doc.createElement( "X" );
     rectElement.appendChild( xElement );
     TQDomText xContent = doc.createTextNode( TQString::number( rect.x() ) );
@@ -187,7 +187,7 @@ void createRectNode( TQDomDocument& doc, TQDomNode& tqparent,
 }
 
 
-void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent,
+void createStringListNodes( TQDomDocument& doc, TQDomNode& parent,
                             const TQString& elementName,
                             const TQStringList* list )
 {
@@ -197,18 +197,18 @@ void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent,
     for( TQStringList::ConstIterator it = list->begin();
          it != list->end(); ++it ) {
         TQDomElement element = doc.createElement( elementName );
-        tqparent.appendChild( element );
+        parent.appendChild( element );
         TQDomText elementContent = doc.createTextNode( *it );
         element.appendChild( elementContent );
     }
 }
 
 
-void createFontNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createFontNode( TQDomDocument& doc, TQDomNode& parent,
                      const TQString& elementName, const TQFont& font )
 {
     TQDomElement fontElement = doc.createElement( elementName );
-    tqparent.appendChild( fontElement );
+    parent.appendChild( fontElement );
     createStringNode( doc, fontElement, "Family", font.family() );
     createIntNode( doc, fontElement, "PointSize", font.pointSize() );
     createIntNode( doc, fontElement, "PixelSize", font.pixelSize() );
@@ -217,44 +217,44 @@ void createFontNode( TQDomDocument& doc, TQDomNode& tqparent,
 }
 
 
-void createPenNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createPenNode( TQDomDocument& doc, TQDomNode& parent,
                     const TQString& elementName, const TQPen& pen )
 {
     TQDomElement penElement = doc.createElement( elementName );
-    tqparent.appendChild( penElement );
+    parent.appendChild( penElement );
     createIntNode( doc, penElement, "Width", pen.width() );
     createColorNode( doc, penElement, "Color", pen.color() );
     createStringNode( doc, penElement, "Style", penStyleToString( pen.style() ) );
 }
 
 
-void createDateTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createDateTimeNode( TQDomDocument& doc, TQDomNode& parent,
                          const TQString& elementName,
                          const TQDateTime& datetime )
 {
     TQDomElement dateTimeElement = doc.createElement( elementName );
-    tqparent.appendChild( dateTimeElement );
+    parent.appendChild( dateTimeElement );
     createDateNode( doc, dateTimeElement, "Date", datetime.date() );
     createTimeNode( doc, dateTimeElement, "Time", datetime.time() );
 }
 
 
-void createDateNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createDateNode( TQDomDocument& doc, TQDomNode& parent,
                      const TQString& elementName, const TQDate& date )
 {
     TQDomElement dateElement = doc.createElement( elementName );
-    tqparent.appendChild( dateElement );
+    parent.appendChild( dateElement );
     dateElement.setAttribute( "Year", TQString::number( date.year() ) );
     dateElement.setAttribute( "Month", TQString::number( date.month() ) );
     dateElement.setAttribute( "Day", TQString::number( date.day() ) );
 }
 
 
-void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createTimeNode( TQDomDocument& doc, TQDomNode& parent,
                       const TQString& elementName, const TQTime& time )
 {
     TQDomElement timeElement = doc.createElement( elementName );
-    tqparent.appendChild( timeElement );
+    parent.appendChild( timeElement );
     timeElement.setAttribute( "Hour",
                                TQString::number( time.hour() ) );
     timeElement.setAttribute( "Minute",
diff --git a/kdgantt/KDGanttXMLTools.h b/kdgantt/KDGanttXMLTools.h
index 30d890a2b..df8b20e19 100644
--- a/kdgantt/KDGanttXMLTools.h
+++ b/kdgantt/KDGanttXMLTools.h
@@ -50,39 +50,39 @@ namespace KDGanttXML {
     TQString brushStyleToString( Qt::BrushStyle style );
     Qt::BrushStyle stringToBrushStyle( const TQString& style );
 
-    void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
                          const TQString& elementName, bool value );
-    void createSizeNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createSizeNode( TQDomDocument& doc, TQDomNode& parent,
                          const TQString& elementName, const TQSize& value );
-    void createIntNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createIntNode( TQDomDocument& doc, TQDomNode& parent,
                         const TQString& elementName, int value );
-    void createDoubleNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createDoubleNode( TQDomDocument& doc, TQDomNode& parent,
                            const TQString& elementName, double value );
-    void createStringNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createStringNode( TQDomDocument& doc, TQDomNode& parent,
                            const TQString& elementName,
                            const TQString& text );
-    void createColorNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createColorNode( TQDomDocument& doc, TQDomNode& parent,
                           const TQString& elementName, const TQColor& color );
-    void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createBrushNode( TQDomDocument& doc, TQDomNode& parent,
                           const TQString& elementName, const TQBrush& brush );
-    void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createPixmapNode( TQDomDocument& doc, TQDomNode& parent,
                            const TQString& elementName, const TQPixmap& pixmap );
-    void createRectNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createRectNode( TQDomDocument& doc, TQDomNode& parent,
                          const TQString& elementName, const TQRect& rect );
-    void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent,
+    void createStringListNodes( TQDomDocument& doc, TQDomNode& parent,
                                 const TQString& elementName,
                                 const TQStringList* list );
-    void createFontNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createFontNode( TQDomDocument& doc, TQDomNode& parent,
                          const TQString& elementName, const TQFont& font );
 
-    void createPenNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createPenNode( TQDomDocument& doc, TQDomNode& parent,
                         const TQString& elementName, const TQPen& pen );
-    void createDateTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createDateTimeNode( TQDomDocument& doc, TQDomNode& parent,
                              const TQString& elementName,
                              const TQDateTime& datetime );
-    void createDateNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createDateNode( TQDomDocument& doc, TQDomNode& parent,
                          const TQString& elementName, const TQDate& date );
-    void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+    void createTimeNode( TQDomDocument& doc, TQDomNode& parent,
                          const TQString& elementName, const TQTime& time );
     bool readIntNode( const TQDomElement& element, int& value );
     bool readStringNode( const TQDomElement& element, TQString& value );
diff --git a/kexi/3rdparty/kexisql/src/btree.c b/kexi/3rdparty/kexisql/src/btree.c
index a257011ed..edcba8c94 100644
--- a/kexi/3rdparty/kexisql/src/btree.c
+++ b/kexi/3rdparty/kexisql/src/btree.c
@@ -313,9 +313,9 @@ struct FreelistInfo {
 ** page to hold as many as two more cells than it might otherwise hold.
 ** The extra two entries in apCell[] are an allowance for this situation.
 **
-** The pParent field points back to the tqparent page.  This allows us to
+** The pParent field points back to the parent page.  This allows us to
 ** walk up the BTree from any leaf to the root.  Care must be taken to
-** unref() the tqparent page pointer when this page is no longer referenced.
+** unref() the parent page pointer when this page is no longer referenced.
 ** The pageDestructor() routine handles that chore.
 */
 struct MemPage {
@@ -326,7 +326,7 @@ struct MemPage {
   u8 isInit;                     /* True if auxiliary data is initialized */
   u8 idxShift;                   /* True if apCell[] indices have changed */
   u8 isOverfull;                 /* Some apCell[] points outside u.aDisk[] */
-  MemPage *pParent;              /* The tqparent of this page.  NULL for root */
+  MemPage *pParent;              /* The parent of this page.  NULL for root */
   int idxParent;                 /* Index in pParent->apCell[] of this node */
   int nFree;                     /* Number of free bytes in u.aDisk[] */
   int nCell;                     /* Number of entries on this page */
@@ -567,8 +567,8 @@ static void freeSpace(Btree *pBt, MemPage *pPage, int start, int size){
 ** Initialize the auxiliary information for a disk block.
 **
 ** The pParent parameter must be a pointer to the MemPage which
-** is the tqparent of the page being initialized.  The root of the
-** BTree (usually page 2) has no tqparent and so for that page, 
+** is the parent of the page being initialized.  The root of the
+** BTree (usually page 2) has no parent and so for that page, 
 ** pParent==NULL.
 **
 ** Return SQLITE_OK on success.  If we see that the page does
@@ -1414,7 +1414,7 @@ static int moveToChild(BtCursor *pCur, int newPgno){
 }
 
 /*
-** Move the cursor up to the tqparent page.
+** Move the cursor up to the parent page.
 **
 ** pCur->idx is set to the cell index that contains the pointer
 ** to the page we are coming from.  If we are coming from the
@@ -1451,7 +1451,7 @@ static void moveToParent(BtCursor *pCur){
   }else{
     /* The MemPage.idxShift flag indicates that cell indices might have 
     ** changed since idxParent was set and hence idxParent might be out
-    ** of date.  So recompute the tqparent cell index by scanning all cells
+    ** of date.  So recompute the parent cell index by scanning all cells
     ** and locating the one that points to the child we just came from.
     */
     int i;
@@ -1998,9 +1998,9 @@ static void reparentPage(Pager *pPager, Pgno pgno, MemPage *pNewParent,int idx){
 }
 
 /*
-** Retqparent all tqchildren 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 tqparent.
+** to make sure that each child knows that pPage is its parent.
 **
 ** This routine gets called after you memcpy() one page into
 ** another.
@@ -2141,7 +2141,7 @@ static void copyPage(MemPage *pTo, MemPage *pFrom){
 ** of pPage so that all pages have about the same amount of free space.
 ** Usually one sibling on either side of pPage is used in the balancing,
 ** though both siblings might come from one side if pPage is the first
-** or last child of its tqparent.  If pPage has fewer than two siblings
+** or last child of its parent.  If pPage has fewer than two siblings
 ** (something which can only happen if pPage is the root page or a 
 ** child of root) then all available siblings participate in the balancing.
 **
@@ -2168,16 +2168,16 @@ static void copyPage(MemPage *pTo, MemPage *pFrom){
 ** if the page is overfull.  Part of the job of this routine is to
 ** make sure all Cells for pPage once again fit in pPage->u.aDisk[].
 **
-** In the course of balancing the siblings of pPage, the tqparent of pPage
+** In the course of balancing the siblings of pPage, the parent of pPage
 ** might become overfull or underfull.  If that happens, then this routine
-** is called recursively on the tqparent.
+** is called recursively on the parent.
 **
 ** If this routine fails for any reason, it might leave the database
 ** in a corrupted state.  So if this routine fails, the database should
 ** be rolled back.
 */
 static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
-  MemPage *pParent;            /* The tqparent of pPage */
+  MemPage *pParent;            /* The parent of pPage */
   int nCell;                   /* Number of cells in apCell[] */
   int nOld;                    /* Number of pages in apOld[] */
   int nNew;                    /* Number of pages in apNew[] */
@@ -2215,8 +2215,8 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   }
 
   /*
-  ** Find the tqparent of the page to be balanceed.
-  ** If there is no tqparent, it means this page is the root page and
+  ** Find the parent of the page to be balanceed.
+  ** If there is no parent, it means this page is the root page and
   ** special rules apply.
   */
   pParent = pPage->pParent;
@@ -2291,7 +2291,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   assert( pParent->isInit );
   
   /*
-  ** Find the Cell in the tqparent page whose h.leftChild points back
+  ** Find the Cell in the parent page whose h.leftChild points back
   ** to pPage.  The "idx" variable is the index of that cell.  If pPage
   ** is the rightmost child of pParent then set idx to pParent->nCell 
   */
@@ -2547,7 +2547,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   }
 
   /*
-  ** Retqparent tqchildren of all cells.
+  ** Reparent tqchildren of all cells.
   */
   for(i=0; i<nNew; i++){
     reparentChildPages(pBt, apNew[i]);
@@ -2555,7 +2555,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   reparentChildPages(pBt, pParent);
 
   /*
-  ** balance the tqparent page.
+  ** balance the parent page.
   */
   rc = balance(pBt, pParent, pCur);
 
diff --git a/kexi/3rdparty/kexisql/src/btree_rb.c b/kexi/3rdparty/kexisql/src/btree_rb.c
index afb2c5084..86feaa5bd 100644
--- a/kexi/3rdparty/kexisql/src/btree_rb.c
+++ b/kexi/3rdparty/kexisql/src/btree_rb.c
@@ -123,7 +123,7 @@ struct BtRbNode {
   int nData;
   void *pData;
   u8 isBlack;        /* true for a black node, 0 for a red node */
-  BtRbNode *pParent; /* Nodes tqparent node, NULL for the tree head */
+  BtRbNode *pParent; /* Nodes parent node, NULL for the tree head */
   BtRbNode *pLeft;   /* Nodes left child, or NULL */
   BtRbNode *pRight;  /* Nodes right child, or NULL */
 
@@ -329,7 +329,7 @@ static void check_redblack_tree(BtRbTree * tree, char ** msg)
 {
   BtRbNode *pNode;
 
-  /* 0 -> came from tqparent 
+  /* 0 -> came from parent 
    * 1 -> came from left
    * 2 -> came from right */
   int prev_step = 0;
@@ -400,34 +400,34 @@ static void check_redblack_tree(BtRbTree * tree, char ** msg)
 
 /*
  * Node pX has just been inserted into pTree (by code in sqliteRbtreeInsert()).
- * It is possible that pX is a red node with a red tqparent, which is a violation
+ * It is possible that pX is a red node with a red parent, which is a violation
  * of the red-black tree properties. This function performs rotations and 
  * color changes to rebalance the tree
  */
 static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX)
 {
   /* In the first iteration of this loop, pX points to the red node just
-   * inserted in the tree. If the tqparent of pX exists (pX is not the root
+   * inserted in the tree. If the parent of pX exists (pX is not the root
    * node) and is red, then the properties of the red-black tree are
    * violated.
    *
    * At the start of any subsequent iterations, pX points to a red node
-   * with a red tqparent. In all other respects the tree is a legal red-black
+   * with a red parent. In all other respects the tree is a legal red-black
    * binary tree. */
   while( pX != pTree->pHead && !pX->pParent->isBlack ){
     BtRbNode *pUncle;
-    BtRbNode *pGrandtqparent;
+    BtRbNode *pGrandparent;
 
-    /* Grandtqparent of pX must exist and must be black. */
-    pGrandtqparent = pX->pParent->pParent;
-    assert( pGrandtqparent );
-    assert( pGrandtqparent->isBlack );
+    /* Grandparent of pX must exist and must be black. */
+    pGrandparent = pX->pParent->pParent;
+    assert( pGrandparent );
+    assert( pGrandparent->isBlack );
 
     /* Uncle of pX may or may not exist. */
-    if( pX->pParent == pGrandtqparent->pLeft ) 
-      pUncle = pGrandtqparent->pRight;
+    if( pX->pParent == pGrandparent->pLeft ) 
+      pUncle = pGrandparent->pRight;
     else 
-      pUncle = pGrandtqparent->pLeft;
+      pUncle = pGrandparent->pLeft;
 
     /* If the uncle of pX exists and is red, we do the following:
      *       |                 |
@@ -438,16 +438,16 @@ static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX)
      *           X(r)              X(r)
      *
      *     BEFORE             AFTER
-     * pX is then set to G. If the tqparent of G is red, then the while loop
+     * pX is then set to G. If the parent of G is red, then the while loop
      * will run again.  */
     if( pUncle && !pUncle->isBlack ){
-      pGrandtqparent->isBlack = 0;
+      pGrandparent->isBlack = 0;
       pUncle->isBlack = 1;
       pX->pParent->isBlack = 1;
-      pX = pGrandtqparent;
+      pX = pGrandparent;
     }else{
 
-      if( pX->pParent == pGrandtqparent->pLeft ){
+      if( pX->pParent == pGrandparent->pLeft ){
         if( pX == pX->pParent->pRight ){
           /* If pX is a right-child, do the following transform, essentially
            * to change pX into a left-child: 
@@ -474,10 +474,10 @@ static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX)
          *
          *     BEFORE             AFTER
          */
-        assert( pGrandtqparent == pX->pParent->pParent );
-        pGrandtqparent->isBlack = 0;
+        assert( pGrandparent == pX->pParent->pParent );
+        pGrandparent->isBlack = 0;
         pX->pParent->isBlack = 1;
-        rightRotate( pTree, pGrandtqparent );
+        rightRotate( pTree, pGrandparent );
 
       }else{
         /* This code is symetric to the illustrated case above. */
@@ -485,10 +485,10 @@ static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX)
           pX = pX->pParent;
           rightRotate(pTree, pX);
         }
-        assert( pGrandtqparent == pX->pParent->pParent );
-        pGrandtqparent->isBlack = 0;
+        assert( pGrandparent == pX->pParent->pParent );
+        pGrandparent->isBlack = 0;
         pX->pParent->isBlack = 1;
-        leftRotate( pTree, pGrandtqparent );
+        leftRotate( pTree, pGrandparent );
       }
     }
   }
diff --git a/kexi/3rdparty/kexisql/src/func.c b/kexi/3rdparty/kexisql/src/func.c
index cf0b8bafa..0fcc291e5 100644
--- a/kexi/3rdparty/kexisql/src/func.c
+++ b/kexi/3rdparty/kexisql/src/func.c
@@ -32,10 +32,10 @@ static void minmaxFunc(sqlite_func *context, int argc, const char **argv){
   const char *zBest; 
   int i;
   int (*xCompare)(const char*, const char*);
-  int tqmask;    /* 0 for min() or 0xffffffff for max() */
+  int mask;    /* 0 for min() or 0xffffffff for max() */
 
   if( argc==0 ) return;
-  tqmask = (int)sqlite_user_data(context);
+  mask = (int)sqlite_user_data(context);
   zBest = argv[0];
   if( zBest==0 ) return;
   if( argv[1][0]=='n' ){
@@ -45,7 +45,7 @@ static void minmaxFunc(sqlite_func *context, int argc, const char **argv){
   }
   for(i=2; i<argc; i+=2){
     if( argv[i]==0 ) return;
-    if( (xCompare(argv[i], zBest)^tqmask)<0 ){
+    if( (xCompare(argv[i], zBest)^mask)<0 ){
       zBest = argv[i];
     }
   }
@@ -514,7 +514,7 @@ struct MinMaxCtx {
 static void minmaxStep(sqlite_func *context, int argc, const char **argv){
   MinMaxCtx *p;
   int (*xCompare)(const char*, const char*);
-  int tqmask;    /* 0 for min() or 0xffffffff for max() */
+  int mask;    /* 0 for min() or 0xffffffff for max() */
 
   assert( argc==2 );
   if( argv[0]==0 ) return;  /* Ignore NULL values */
@@ -523,11 +523,11 @@ static void minmaxStep(sqlite_func *context, int argc, const char **argv){
   }else{
     xCompare = strcmp;
   }
-  tqmask = (int)sqlite_user_data(context);
-  assert( tqmask==0 || tqmask==-1 );
+  mask = (int)sqlite_user_data(context);
+  assert( mask==0 || mask==-1 );
   p = sqlite_aggregate_context(context, sizeof(*p));
   if( p==0 || argc<1 ) return;
-  if( p->z==0 || (xCompare(argv[0],p->z)^tqmask)<0 ){
+  if( p->z==0 || (xCompare(argv[0],p->z)^mask)<0 ){
     int len;
     if( p->zBuf[0] ){
       sqliteFree(p->z);
diff --git a/kexi/3rdparty/kexisql/src/parse.c b/kexi/3rdparty/kexisql/src/parse.c
index 77b09c5b9..2fd6ae395 100644
--- a/kexi/3rdparty/kexisql/src/parse.c
+++ b/kexi/3rdparty/kexisql/src/parse.c
@@ -97,7 +97,7 @@ typedef union {
   IdList* yy320;
   ExprList* yy322;
   int yy372;
-  struct {int value; int tqmask;} yy407;
+  struct {int value; int mask;} yy407;
   int yy441;
 } YYMINORTYPE;
 #define YYSTACKDEPTH 100
@@ -2218,33 +2218,33 @@ static void yy_reduce(
         break;
       case 62:
 #line 207 "parse.y"
-{ yygotominor.yy372 = (yymsp[-1].minor.yy372 & yymsp[0].minor.yy407.tqmask) | yymsp[0].minor.yy407.value; }
+{ yygotominor.yy372 = (yymsp[-1].minor.yy372 & yymsp[0].minor.yy407.mask) | yymsp[0].minor.yy407.value; }
 #line 2222 "parse.c"
         break;
       case 63:
 #line 209 "parse.y"
-{ yygotominor.yy407.value = 0;     yygotominor.yy407.tqmask = 0x000000; }
+{ yygotominor.yy407.value = 0;     yygotominor.yy407.mask = 0x000000; }
 #line 2227 "parse.c"
         /* No destructor defined for MATCH */
         /* No destructor defined for nm */
         break;
       case 64:
 #line 210 "parse.y"
-{ yygotominor.yy407.value = yymsp[0].minor.yy372;     yygotominor.yy407.tqmask = 0x0000ff; }
+{ yygotominor.yy407.value = yymsp[0].minor.yy372;     yygotominor.yy407.mask = 0x0000ff; }
 #line 2234 "parse.c"
         /* No destructor defined for ON */
         /* No destructor defined for DELETE */
         break;
       case 65:
 #line 211 "parse.y"
-{ yygotominor.yy407.value = yymsp[0].minor.yy372<<8;  yygotominor.yy407.tqmask = 0x00ff00; }
+{ yygotominor.yy407.value = yymsp[0].minor.yy372<<8;  yygotominor.yy407.mask = 0x00ff00; }
 #line 2241 "parse.c"
         /* No destructor defined for ON */
         /* No destructor defined for UPDATE */
         break;
       case 66:
 #line 212 "parse.y"
-{ yygotominor.yy407.value = yymsp[0].minor.yy372<<16; yygotominor.yy407.tqmask = 0xff0000; }
+{ yygotominor.yy407.value = yymsp[0].minor.yy372<<16; yygotominor.yy407.mask = 0xff0000; }
 #line 2248 "parse.c"
         /* No destructor defined for ON */
         /* No destructor defined for INSERT */
diff --git a/kexi/3rdparty/kexisql/src/parse.y b/kexi/3rdparty/kexisql/src/parse.y
index ad0f3716c..29bb493b4 100644
--- a/kexi/3rdparty/kexisql/src/parse.y
+++ b/kexi/3rdparty/kexisql/src/parse.y
@@ -193,12 +193,12 @@ ccons ::= COLLATE id(C).  {
 //
 %type refargs {int}
 refargs(A) ::= .                     { A = OE_Restrict * 0x010101; }
-refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.tqmask) | Y.value; }
-%type refarg {struct {int value; int tqmask;}}
-refarg(A) ::= MATCH nm.              { A.value = 0;     A.tqmask = 0x000000; }
-refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.tqmask = 0x0000ff; }
-refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.tqmask = 0x00ff00; }
-refarg(A) ::= ON INSERT refact(X).   { A.value = X<<16; A.tqmask = 0xff0000; }
+refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.mask) | Y.value; }
+%type refarg {struct {int value; int mask;}}
+refarg(A) ::= MATCH nm.              { A.value = 0;     A.mask = 0x000000; }
+refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.mask = 0x0000ff; }
+refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.mask = 0x00ff00; }
+refarg(A) ::= ON INSERT refact(X).   { A.value = X<<16; A.mask = 0xff0000; }
 %type refact {int}
 refact(A) ::= SET NULL.              { A = OE_SetNull; }
 refact(A) ::= SET DEFAULT.           { A = OE_SetDflt; }
diff --git a/kexi/3rdparty/kexisql/src/pragma.c b/kexi/3rdparty/kexisql/src/pragma.c
index 7b100a70a..4f1026573 100644
--- a/kexi/3rdparty/kexisql/src/pragma.c
+++ b/kexi/3rdparty/kexisql/src/pragma.c
@@ -114,7 +114,7 @@ static int changeTempStorage(Parse *pParse, const char *zStorageType){
 static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
   static const struct {
     const char *zName;  /* Name of the pragma */
-    int tqmask;           /* Mask for the db->flags value */
+    int mask;           /* Mask for the db->flags value */
   } aPragma[] = {
     { "vdbe_trace",               SQLITE_VdbeTrace     },
     { "full_column_names",        SQLITE_FullColNames  },
@@ -131,13 +131,13 @@ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
       if( strcmp(zLeft,zRight)==0 && (v = sqliteGetVdbe(pParse))!=0 ){
         sqliteVdbeOp3(v, OP_ColumnName, 0, 1, aPragma[i].zName, P3_STATIC);
         sqliteVdbeOp3(v, OP_ColumnName, 1, 0, "boolean", P3_STATIC);
-        sqliteVdbeCode(v, OP_Integer, (db->flags & aPragma[i].tqmask)!=0, 0,
+        sqliteVdbeCode(v, OP_Integer, (db->flags & aPragma[i].mask)!=0, 0,
                           OP_Callback, 1, 0,
                           0);
       }else if( getBoolean(zRight) ){
-        db->flags |= aPragma[i].tqmask;
+        db->flags |= aPragma[i].mask;
       }else{
-        db->flags &= ~aPragma[i].tqmask;
+        db->flags &= ~aPragma[i].mask;
       }
       return 1;
     }
diff --git a/kexi/3rdparty/kexisql/src/select.c b/kexi/3rdparty/kexisql/src/select.c
index 0dde6d2e4..7ae02d330 100644
--- a/kexi/3rdparty/kexisql/src/select.c
+++ b/kexi/3rdparty/kexisql/src/select.c
@@ -1634,7 +1634,7 @@ substExprList(ExprList *pList, int iTable, ExprList *pEList){
 */
 static int flattenSubquery(
   Parse *pParse,       /* The parsing context */
-  Select *p,           /* The tqparent or outer SELECT statement */
+  Select *p,           /* The parent or outer SELECT statement */
   int iFrom,           /* Index in p->pSrc->a[] of the inner subquery */
   int isAgg,           /* True if outer SELECT uses aggregate functions */
   int subqueryIsAgg    /* True if the subquery uses aggregate functions */
@@ -1987,8 +1987,8 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
 **
 ** The pParent, parentTab, and *pParentAgg fields are filled in if this
 ** SELECT is a subquery.  This routine may try to combine this SELECT
-** with its tqparent to form a single flat query.  In so doing, it might
-** change the tqparent query from a non-aggregate to an aggregate query.
+** with its parent to form a single flat query.  In so doing, it might
+** change the parent query from a non-aggregate to an aggregate query.
 ** For that reason, the pParentAgg flag is passed as a pointer, so it
 ** can be changed.
 **
@@ -2228,7 +2228,7 @@ int sqliteSelect(
     goto select_end;
   }
 
-  /* Check to see if this is a subquery that can be "flattened" into its tqparent.
+  /* Check to see if this is a subquery that can be "flattened" into its parent.
   ** If flattening is a possiblity, do so and return immediately.  
   */
   if( pParent && pParentAgg &&
@@ -2409,7 +2409,7 @@ int sqliteSelect(
   }
 
   /* If this was a subquery, we have now converted the subquery into a
-  ** temporary table.  So delete the subquery structure from the tqparent
+  ** temporary table.  So delete the subquery structure from the parent
   ** to prevent this subquery from being evaluated again and to force the
   ** the use of the temporary table.
   */
diff --git a/kexi/3rdparty/kexisql/src/sqliteInt.h b/kexi/3rdparty/kexisql/src/sqliteInt.h
index ca5a85e97..3f8858e0b 100644
--- a/kexi/3rdparty/kexisql/src/sqliteInt.h
+++ b/kexi/3rdparty/kexisql/src/sqliteInt.h
@@ -1053,9 +1053,9 @@ struct TriggerStep {
  *
  * struct TriggerStack has a "pNext" member, to allow linked lists to be
  * constructed. When coding nested triggers (triggers fired by other triggers)
- * each nested trigger stores its tqparent trigger's TriggerStack as the "pNext" 
+ * each nested trigger stores its parent trigger's TriggerStack as the "pNext" 
  * pointer. Once the nested trigger has been coded, the pNext value is restored
- * to the pTriggerStack member of the Parse stucture and coding of the tqparent
+ * to the pTriggerStack member of the Parse stucture and coding of the parent
  * trigger continues.
  *
  * Before a nested trigger is coded, the linked list pointed to by the 
diff --git a/kexi/3rdparty/kexisql/src/where.c b/kexi/3rdparty/kexisql/src/where.c
index bb6a7f4f6..714972f87 100644
--- a/kexi/3rdparty/kexisql/src/where.c
+++ b/kexi/3rdparty/kexisql/src/where.c
@@ -29,9 +29,9 @@ struct ExprInfo {
                           ** p->pLeft is not the column of any table */
   short int idxRight;     /* p->pRight is a column in this table number. -1 if
                           ** p->pRight is not the column of any table */
-  unsigned prereqLeft;    /* Bittqmask of tables referenced by p->pLeft */
-  unsigned prereqRight;   /* Bittqmask of tables referenced by p->pRight */
-  unsigned prereqAll;     /* Bittqmask of tables referenced by p */
+  unsigned prereqLeft;    /* Bitmask of tables referenced by p->pLeft */
+  unsigned prereqRight;   /* Bitmask of tables referenced by p->pRight */
+  unsigned prereqAll;     /* Bitmask of tables referenced by p */
 };
 
 /*
@@ -81,12 +81,12 @@ static int exprSplit(int nSlot, ExprInfo *aSlot, Expr *pExpr){
 }
 
 /*
-** Initialize an expression tqmask set
+** Initialize an expression mask set
 */
 #define initMaskSet(P)  memset(P, 0, sizeof(*P))
 
 /*
-** Return the bittqmask for the given cursor.  Assign a new bittqmask
+** Return the bitmask for the given cursor.  Assign a new bitmask
 ** if this is the first time the cursor has been seen.
 */
 static int getMask(ExprMaskSet *pMaskSet, int iCursor){
@@ -103,13 +103,13 @@ static int getMask(ExprMaskSet *pMaskSet, int iCursor){
 }
 
 /*
-** Destroy an expression tqmask set
+** Destroy an expression mask set
 */
 #define freeMaskSet(P)   /* NO-OP */
 
 /*
 ** This routine walks (recursively) an expression tree and generates
-** a bittqmask indicating which tables are used in that expression
+** a bitmask indicating which tables are used in that expression
 ** tree.
 **
 ** In order for this routine to work, the calling function must have
@@ -120,26 +120,26 @@ static int getMask(ExprMaskSet *pMaskSet, int iCursor){
 ** the VDBE cursor number of the table.
 */
 static int exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){
-  unsigned int tqmask = 0;
+  unsigned int mask = 0;
   if( p==0 ) return 0;
   if( p->op==TK_COLUMN ){
-    tqmask = getMask(pMaskSet, p->iTable);
-    if( tqmask==0 ) tqmask = -1;
-    return tqmask;
+    mask = getMask(pMaskSet, p->iTable);
+    if( mask==0 ) mask = -1;
+    return mask;
   }
   if( p->pRight ){
-    tqmask = exprTableUsage(pMaskSet, p->pRight);
+    mask = exprTableUsage(pMaskSet, p->pRight);
   }
   if( p->pLeft ){
-    tqmask |= exprTableUsage(pMaskSet, p->pLeft);
+    mask |= exprTableUsage(pMaskSet, p->pLeft);
   }
   if( p->pList ){
     int i;
     for(i=0; i<p->pList->nExpr; i++){
-      tqmask |= exprTableUsage(pMaskSet, p->pList->a[i].pExpr);
+      mask |= exprTableUsage(pMaskSet, p->pList->a[i].pExpr);
     }
   }
-  return tqmask;
+  return mask;
 }
 
 /*
@@ -391,7 +391,7 @@ WhereInfo *sqliteWhereBegin(
   int nExpr;           /* Number of subexpressions in the WHERE clause */
   int loopMask;        /* One bit set for each outer loop */
   int haveKey;         /* True if KEY is on the stack */
-  ExprMaskSet maskSet; /* The expression tqmask set */
+  ExprMaskSet maskSet; /* The expression mask set */
   int iDirectEq[32];   /* Term of the form ROWID==X for the N-th table */
   int iDirectLt[32];   /* Term of the form ROWID<X or ROWID<=X */
   int iDirectGt[32];   /* Term of the form ROWID>X or ROWID>=X */
@@ -448,16 +448,16 @@ WhereInfo *sqliteWhereBegin(
     if( pParse->trigStack ){
       int x;
       if( (x = pParse->trigStack->newIdx) >= 0 ){
-        int tqmask = ~getMask(&maskSet, x);
-        aExpr[i].prereqRight &= tqmask;
-        aExpr[i].prereqLeft &= tqmask;
-        aExpr[i].prereqAll &= tqmask;
+        int mask = ~getMask(&maskSet, x);
+        aExpr[i].prereqRight &= mask;
+        aExpr[i].prereqLeft &= mask;
+        aExpr[i].prereqAll &= mask;
       }
       if( (x = pParse->trigStack->oldIdx) >= 0 ){
-        int tqmask = ~getMask(&maskSet, x);
-        aExpr[i].prereqRight &= tqmask;
-        aExpr[i].prereqLeft &= tqmask;
-        aExpr[i].prereqAll &= tqmask;
+        int mask = ~getMask(&maskSet, x);
+        aExpr[i].prereqRight &= mask;
+        aExpr[i].prereqLeft &= mask;
+        aExpr[i].prereqAll &= mask;
       }
     }
   }
@@ -476,13 +476,13 @@ WhereInfo *sqliteWhereBegin(
   **
   ** Actually, if there are more than 32 tables in the join, only the
   ** first 32 tables are candidates for indices.  This is (again) due
-  ** to the limit of 32 bits in an integer bittqmask.
+  ** to the limit of 32 bits in an integer bitmask.
   */
   loopMask = 0;
   for(i=0; i<pTabList->nSrc && i<ARRAYSIZE(iDirectEq); i++){
     int j;
     int iCur = pTabList->a[i].iCursor;    /* The cursor for this table */
-    int tqmask = getMask(&maskSet, iCur);   /* Cursor tqmask for this table */
+    int mask = getMask(&maskSet, iCur);   /* Cursor mask for this table */
     Table *pTab = pTabList->a[i].pTab;
     Index *pIdx;
     Index *pBestIdx = 0;
@@ -524,7 +524,7 @@ WhereInfo *sqliteWhereBegin(
       }
     }
     if( iDirectEq[i]>=0 ){
-      loopMask |= tqmask;
+      loopMask |= mask;
       pWInfo->a[i].pIdx = 0;
       continue;
     }
@@ -651,7 +651,7 @@ WhereInfo *sqliteWhereBegin(
     pWInfo->a[i].pIdx = pBestIdx;
     pWInfo->a[i].score = bestScore;
     pWInfo->a[i].bRev = 0;
-    loopMask |= tqmask;
+    loopMask |= mask;
     if( pBestIdx ){
       pWInfo->a[i].iCur = pParse->nTab++;
       pWInfo->peakNTab = pParse->nTab;
diff --git a/kexi/3rdparty/kexisql/tool/lemon.c b/kexi/3rdparty/kexisql/tool/lemon.c
index a0eef8104..b801e6b39 100644
--- a/kexi/3rdparty/kexisql/tool/lemon.c
+++ b/kexi/3rdparty/kexisql/tool/lemon.c
@@ -2542,10 +2542,10 @@ struct lemon *lemp;
 
 /* Search for the file "name" which is in the same directory as
 ** the exacutable */
-PRIVATE char *pathsearch(argv0,name,modetqmask)
+PRIVATE char *pathsearch(argv0,name,modemask)
 char *argv0;
 char *name;
-int modetqmask;
+int modemask;
 {
   char *pathlist;
   char *path,*cp;
@@ -2578,7 +2578,7 @@ int modetqmask;
         *cp = c;
         if( c==0 ) pathlist = "";
         else pathlist = &cp[1];
-        if( access(path,modetqmask)==0 ) break;
+        if( access(path,modemask)==0 ) break;
       }
     }
   }
diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c
index 0a2501d01..4ed6c51aa 100644
--- a/kexi/3rdparty/kexisql3/src/btree.c
+++ b/kexi/3rdparty/kexisql3/src/btree.c
@@ -262,9 +262,9 @@ static const char zMagicHeader[] = SQLITE_FILE_HEADER;
 ** structure is appended and initialized to zero.  This structure stores
 ** information about the page that is decoded from the raw file page.
 **
-** The pParent field points back to the tqparent page.  This allows us to
+** The pParent field points back to the parent page.  This allows us to
 ** walk up the BTree from any leaf to the root.  Care must be taken to
-** unref() the tqparent page pointer when this page is no longer referenced.
+** unref() the parent page pointer when this page is no longer referenced.
 ** The pageDestructor() routine handles that chore.
 */
 struct MemPage {
@@ -281,7 +281,7 @@ struct MemPage {
   u16 maxLocal;        /* Copy of Btree.maxLocal or Btree.maxLeaf */
   u16 minLocal;        /* Copy of Btree.minLocal or Btree.minLeaf */
   u16 cellOffset;      /* Index in aData of first cell pointer */
-  u16 idxParent;       /* Index in tqparent of this node */
+  u16 idxParent;       /* Index in parent of this node */
   u16 nFree;           /* Number of free bytes on the page */
   u16 nCell;           /* Number of cells on this page, local and ovfl */
   struct _OvflCell {   /* Cells that will not fit on aData[] */
@@ -291,7 +291,7 @@ struct MemPage {
   struct Btree *pBt;   /* Pointer back to BTree structure */
   u8 *aData;           /* Pointer back to the start of the page */
   Pgno pgno;           /* Page number for this page */
-  MemPage *pParent;    /* The tqparent of this page.  NULL for root */
+  MemPage *pParent;    /* The parent of this page.  NULL for root */
 };
 
 /*
@@ -443,18 +443,18 @@ static void put4byte(unsigned char *p, u32 v){
 #define PTRMAP_ISPAGE(pgsz, pgno) (PTRMAP_PAGENO(pgsz,pgno)==pgno)
 
 /*
-** The pointer map is a lookup table that identifies the tqparent page for
-** each child page in the database file.  The tqparent page is the page that
+** The pointer map is a lookup table that identifies the parent page for
+** each child page in the database file.  The parent page is the page that
 ** contains a pointer to the child.  Every page in the database contains
-** 0 or 1 tqparent pages.  (In this context 'database page' refers
+** 0 or 1 parent pages.  (In this context 'database page' refers
 ** to any page that is not part of the pointer map itself.)  Each pointer map
-** entry consists of a single byte 'type' and a 4 byte tqparent page number.
+** entry consists of a single byte 'type' and a 4 byte parent page number.
 ** The PTRMAP_XXX identifiers below are the valid types.
 **
 ** The purpose of the pointer map is to facility moving pages from one
 ** position in the file to another as part of autovacuum.  When a page
-** is moved, the pointer in its tqparent must be updated to point to the
-** new location.  The pointer map is used to locate the tqparent page quickly.
+** is moved, the pointer in its parent must be updated to point to the
+** new location.  The pointer map is used to locate the parent page quickly.
 **
 ** PTRMAP_ROOTPAGE: The database page is a root-page. The page-number is not
 **                  used in this case.
@@ -471,7 +471,7 @@ static void put4byte(unsigned char *p, u32 v){
 **                   page in the overflow page list.
 **
 ** PTRMAP_BTREE: The database page is a non-root btree page. The page number
-**               identifies the tqparent page in the btree.
+**               identifies the parent page in the btree.
 */
 #define PTRMAP_ROOTPAGE 1
 #define PTRMAP_FREEPAGE 2
@@ -483,10 +483,10 @@ static void put4byte(unsigned char *p, u32 v){
 ** Write an entry into the pointer map.
 **
 ** This routine updates the pointer map entry for page number 'key'
-** so that it maps to type 'eType' and tqparent page number 'pgno'.
+** so that it maps to type 'eType' and parent page number 'pgno'.
 ** An error code is returned if something goes wrong, otherwise SQLITE_OK.
 */
-static int ptrmapPut(Btree *pBt, Pgno key, u8 eType, Pgno tqparent){
+static int ptrmapPut(Btree *pBt, Pgno key, u8 eType, Pgno parent){
   u8 *pPtrmap;    /* The pointer map page */
   Pgno iPtrmap;   /* The pointer map page number */
   int offset;     /* Offset in pointer map page */
@@ -503,12 +503,12 @@ static int ptrmapPut(Btree *pBt, Pgno key, u8 eType, Pgno tqparent){
   }
   offset = PTRMAP_PTROFFSET(pBt->usableSize, key);
 
-  if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=tqparent ){
-    TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, tqparent));
+  if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=parent ){
+    TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, parent));
     rc = sqlite3pager_write(pPtrmap);
     if( rc==SQLITE_OK ){
       pPtrmap[offset] = eType;
-      put4byte(&pPtrmap[offset+1], tqparent);
+      put4byte(&pPtrmap[offset+1], parent);
     }
   }
 
@@ -520,7 +520,7 @@ static int ptrmapPut(Btree *pBt, Pgno key, u8 eType, Pgno tqparent){
 ** Read an entry from the pointer map.
 **
 ** This routine retrieves the pointer map entry for page 'key', writing
-** the type and tqparent page number to *pEType and *pPgno respectively.
+** the type and parent page number to *pEType and *pPgno respectively.
 ** An error code is returned if something goes wrong, otherwise SQLITE_OK.
 */
 static int ptrmapGet(Btree *pBt, Pgno key, u8 *pEType, Pgno *pPgno){
@@ -1001,8 +1001,8 @@ static void decodeFlags(MemPage *pPage, int flagByte){
 ** Initialize the auxiliary information for a disk block.
 **
 ** The pParent parameter must be a pointer to the MemPage which
-** is the tqparent of the page being initialized.  The root of a
-** BTree has no tqparent and so for that page, pParent==NULL.
+** is the parent of the page being initialized.  The root of a
+** BTree has no parent and so for that page, pParent==NULL.
 **
 ** Return SQLITE_OK on success.  If we see that the page does
 ** not contain a well-formed database page, then return 
@@ -1012,7 +1012,7 @@ static void decodeFlags(MemPage *pPage, int flagByte){
 */
 static int initPage(
   MemPage *pPage,        /* The page to be initialized */
-  MemPage *pParent       /* The tqparent.  Might be NULL */
+  MemPage *pParent       /* The parent.  Might be NULL */
 ){
   int pc;            /* Address of a freeblock within pPage->aData[] */
   int hdr;           /* Offset to beginning of page header */
@@ -1029,7 +1029,7 @@ static int initPage(
   assert( pPage->pgno==sqlite3pager_pagenumber(pPage->aData) );
   assert( pPage->aData == &((unsigned char*)pPage)[-pBt->pageSize] );
   if( pPage->pParent!=pParent && (pPage->pParent!=0 || pPage->isInit) ){
-    /* The tqparent page should never change unless the file is corrupt */
+    /* The parent page should never change unless the file is corrupt */
     return SQLITE_CORRUPT_BKPT;
   }
   if( pPage->isInit ) return SQLITE_OK;
@@ -2578,7 +2578,7 @@ static int isRootPage(MemPage *pPage){
 }
 
 /*
-** Move the cursor up to the tqparent page.
+** Move the cursor up to the parent page.
 **
 ** pCur->idx is set to the cell index that contains the pointer
 ** to the page we are coming from.  If we are coming from the
@@ -3429,7 +3429,7 @@ static int reparentPage(Btree *pBt, Pgno pgno, MemPage *pNewParent, int idx){
 ** to pPage.
 **
 ** In other words, for every child of pPage, invoke reparentPage()
-** to make sure that each child knows that pPage is its tqparent.
+** to make sure that each child knows that pPage is its parent.
 **
 ** This routine gets called after you memcpy() one page into
 ** another.
@@ -3659,7 +3659,7 @@ static int balance(MemPage*, int);
 ** fill up.  On average.
 **
 ** pPage is the leaf page which is the right-most page in the tree.
-** pParent is its tqparent.  pPage must have a single overflow entry
+** pParent is its parent.  pPage must have a single overflow entry
 ** which is also the right-most entry on the page.
 */
 static int balance_quick(MemPage *pPage, MemPage *pParent){
@@ -3687,7 +3687,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
   assemblePage(pNew, 1, &pCell, &szCell);
   pPage->nOverflow = 0;
 
-  /* Set the tqparent of the newly allocated page to pParent. */
+  /* Set the parent of the newly allocated page to pParent. */
   pNew->pParent = pParent;
   sqlite3pager_ref(pParent->aData);
 
@@ -3726,7 +3726,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
   }
 #endif
 
-  /* Release the reference to the new page and balance the tqparent page,
+  /* Release the reference to the new page and balance the parent page,
   ** in case the divider cell inserted caused it to become overfull.
   */
   releasePage(pNew);
@@ -3752,7 +3752,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
 ** of pPage so that all pages have about the same amount of free space.
 ** Usually NN siblings on either side of pPage is used in the balancing,
 ** though more siblings might come from one side if pPage is the first
-** or last child of its tqparent.  If pPage has fewer than 2*NN siblings
+** or last child of its parent.  If pPage has fewer than 2*NN siblings
 ** (something which can only happen if pPage is the root page or a 
 ** child of root) then all available siblings participate in the balancing.
 **
@@ -3768,16 +3768,16 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
 ** if the page is overfull.  Part of the job of this routine is to
 ** make sure all Cells for pPage once again fit in pPage->aData[].
 **
-** In the course of balancing the siblings of pPage, the tqparent of pPage
+** In the course of balancing the siblings of pPage, the parent of pPage
 ** might become overfull or underfull.  If that happens, then this routine
-** is called recursively on the tqparent.
+** is called recursively on the parent.
 **
 ** If this routine fails for any reason, it might leave the database
 ** in a corrupted state.  So if this routine fails, the database should
 ** be rolled back.
 */
 static int balance_nonroot(MemPage *pPage){
-  MemPage *pParent;            /* The tqparent of pPage */
+  MemPage *pParent;            /* The parent of pPage */
   Btree *pBt;                  /* The whole database */
   int nCell = 0;               /* Number of cells in apCell[] */
   int nMaxCells = 0;           /* Allocated size of apCell, szCell, aFrom. */
@@ -3812,7 +3812,7 @@ static int balance_nonroot(MemPage *pPage){
 #endif
 
   /* 
-  ** Find the tqparent page.
+  ** Find the parent page.
   */
   assert( pPage->isInit );
   assert( sqlite3pager_iswriteable(pPage->aData) );
@@ -3848,7 +3848,7 @@ static int balance_nonroot(MemPage *pPage){
 #endif
 
   /*
-  ** Find the cell in the tqparent page whose left child points back
+  ** Find the cell in the parent page whose left child points back
   ** to pPage.  The "idx" variable is the index of that cell.  If pPage
   ** is the rightmost child of pParent then set idx to pParent->nCell 
   */
@@ -4218,7 +4218,7 @@ static int balance_nonroot(MemPage *pPage){
     j = cntNew[i];
 
     /* If the sibling page assembled above was not the right-most sibling,
-    ** insert a divider cell into the tqparent page.
+    ** insert a divider cell into the parent page.
     */
     if( i<nNew-1 && j<nCell ){
       u8 *pCell;
@@ -4284,7 +4284,7 @@ static int balance_nonroot(MemPage *pPage){
   }
 
   /*
-  ** Retqparent tqchildren of all cells.
+  ** Reparent tqchildren of all cells.
   */
   for(i=0; i<nNew; i++){
     rc = reparentChildPages(apNew[i]);
@@ -4294,9 +4294,9 @@ static int balance_nonroot(MemPage *pPage){
   if( rc!=SQLITE_OK ) goto balance_cleanup;
 
   /*
-  ** Balance the tqparent page.  Note that the current page (pPage) might
+  ** Balance the parent page.  Note that the current page (pPage) might
   ** have been added to the freelist so it might no longer be initialized.
-  ** But the tqparent page will always be initialized.
+  ** But the parent page will always be initialized.
   */
   assert( pParent->isInit );
   /* assert( pPage->isInit ); // No! pPage might have been added to freelist */
@@ -4376,7 +4376,7 @@ static int balance_shallower(MemPage *pPage){
           szCell[i] = cellSizePtr(pChild, apCell[i]);
         }
         assemblePage(pPage, pChild->nCell, apCell, szCell);
-        /* Copy the right-pointer of the child to the tqparent. */
+        /* Copy the right-pointer of the child to the parent. */
         put4byte(&pPage->aData[pPage->hdrOffset+8], 
             get4byte(&pChild->aData[pChild->hdrOffset+8]));
         freePage(pChild);
@@ -4433,10 +4433,10 @@ static int balance_deeper(MemPage *pPage){
   Pgno pgnoChild;     /* Page number of the new child page */
   Btree *pBt;         /* The BTree */
   int usableSize;     /* Total usable size of a page */
-  u8 *data;           /* Content of the tqparent page */
+  u8 *data;           /* Content of the parent page */
   u8 *cdata;          /* Content of the child page */
-  int hdr;            /* Offset to page header in tqparent */
-  int brk;            /* Offset to content of first cell in tqparent */
+  int hdr;            /* Offset to page header in parent */
+  int brk;            /* Offset to content of first cell in parent */
 
   assert( pPage->pParent==0 );
   assert( pPage->nOverflow>0 );
@@ -5136,7 +5136,7 @@ static int btreePageDump(Btree *pBt, int pgno, int recursive, MemPage *pParent){
   pPage->leaf = (c & PTF_LEAF)!=0;
   pPage->hasData = !(pPage->zeroData || (!pPage->leaf && pPage->leafData));
   nCell = get2byte(&data[hdr+3]);
-  sqlite3DebugPrintf("PAGE %d:  flags=0x%02x  frag=%d   tqparent=%d\n", pgno,
+  sqlite3DebugPrintf("PAGE %d:  flags=0x%02x  frag=%d   parent=%d\n", pgno,
     data[hdr], data[hdr+7], 
     (pPage->isInit && pPage->pParent) ? pPage->pParent->pgno : 0);
   assert( hdr == (pgno==1 ? 100 : 0) );
@@ -5353,7 +5353,7 @@ static void checkPtrmap(
   IntegrityCk *pCheck,   /* Integrity check context */
   Pgno iChild,           /* Child page number */
   u8 eType,              /* Expected pointer map type */
-  Pgno iParent,          /* Expected pointer map tqparent page number */
+  Pgno iParent,          /* Expected pointer map parent page number */
   char *zContext         /* Context description (used for error msg) */
 ){
   int rc;
diff --git a/kexi/3rdparty/kexisql3/src/build.c b/kexi/3rdparty/kexisql3/src/build.c
index 4fcd2bc07..9818c954b 100644
--- a/kexi/3rdparty/kexisql3/src/build.c
+++ b/kexi/3rdparty/kexisql3/src/build.c
@@ -67,19 +67,19 @@ void sqlite3FinishCoding(Parse *pParse){
   if( v ){
     sqlite3VdbeAddOp(v, OP_Halt, 0, 0);
 
-    /* The cookie tqmask contains one bit for each database file open.
+    /* The cookie mask contains one bit for each database file open.
     ** (Bit 0 is for main, bit 1 is for temp, and so forth.)  Bits are
     ** set for each database that is used.  Generate code to start a
     ** transaction on each used database and to verify the schema cookie
     ** on each used database.
     */
     if( pParse->cookieGoto>0 ){
-      u32 tqmask;
+      u32 mask;
       int iDb;
       sqlite3VdbeJumpHere(v, pParse->cookieGoto-1);
-      for(iDb=0, tqmask=1; iDb<db->nDb; tqmask<<=1, iDb++){
-        if( (tqmask & pParse->cookieMask)==0 ) continue;
-        sqlite3VdbeAddOp(v, OP_Transaction, iDb, (tqmask & pParse->writeMask)!=0);
+      for(iDb=0, mask=1; iDb<db->nDb; mask<<=1, iDb++){
+        if( (mask & pParse->cookieMask)==0 ) continue;
+        sqlite3VdbeAddOp(v, OP_Transaction, iDb, (mask & pParse->writeMask)!=0);
         sqlite3VdbeAddOp(v, OP_VerifyCookie, iDb, pParse->cookieValue[iDb]);
       }
       sqlite3VdbeAddOp(v, OP_Goto, 0, pParse->cookieGoto);
@@ -2766,7 +2766,7 @@ static int sqlite3OpenTempDatabase(Parse *pParse){
 void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
   sqlite3 *db;
   Vdbe *v;
-  int tqmask;
+  int mask;
 
   v = sqlite3GetVdbe(pParse);
   if( v==0 ) return;  /* This only happens if there was a prior error */
@@ -2778,9 +2778,9 @@ void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
     assert( iDb<db->nDb );
     assert( db->aDb[iDb].pBt!=0 || iDb==1 );
     assert( iDb<32 );
-    tqmask = 1<<iDb;
-    if( (pParse->cookieMask & tqmask)==0 ){
-      pParse->cookieMask |= tqmask;
+    mask = 1<<iDb;
+    if( (pParse->cookieMask & mask)==0 ){
+      pParse->cookieMask |= mask;
       pParse->cookieValue[iDb] = db->aDb[iDb].schema_cookie;
       if( !OMIT_TEMPDB && iDb==1 ){
         sqlite3OpenTempDatabase(pParse);
diff --git a/kexi/3rdparty/kexisql3/src/expr.c b/kexi/3rdparty/kexisql3/src/expr.c
index 9d079e1b2..ac2095525 100644
--- a/kexi/3rdparty/kexisql3/src/expr.c
+++ b/kexi/3rdparty/kexisql3/src/expr.c
@@ -1018,15 +1018,15 @@ static int lookupName(
   }
 
   /* If a column from a table in pSrcList is referenced, then record
-  ** this fact in the pSrcList.a[].colUsed bittqmask.  Column 0 causes
+  ** this fact in the pSrcList.a[].colUsed bitmask.  Column 0 causes
   ** bit 0 to be set.  Column 1 sets bit 1.  And so forth.  If the
-  ** column number is greater than the number of bits in the bittqmask
-  ** then set the high-order bit of the bittqmask.
+  ** column number is greater than the number of bits in the bitmask
+  ** then set the high-order bit of the bitmask.
   */
   if( pExpr->iColumn>=0 && pMatch!=0 ){
     int n = pExpr->iColumn;
-    if( n>=sizeof(Bittqmask)*8 ){
-      n = sizeof(Bittqmask)*8-1;
+    if( n>=sizeof(Bitmask)*8 ){
+      n = sizeof(Bitmask)*8-1;
     }
     assert( pMatch->iCursor==pExpr->iTable );
     pMatch->colUsed |= 1<<n;
diff --git a/kexi/3rdparty/kexisql3/src/func.c b/kexi/3rdparty/kexisql3/src/func.c
index 364353437..3e50d8fb0 100644
--- a/kexi/3rdparty/kexisql3/src/func.c
+++ b/kexi/3rdparty/kexisql3/src/func.c
@@ -42,20 +42,20 @@ static void minmaxFunc(
   sqlite3_value **argv
 ){
   int i;
-  int tqmask;    /* 0 for min() or 0xffffffff for max() */
+  int mask;    /* 0 for min() or 0xffffffff for max() */
   int iBest;
   CollSeq *pColl;
 
   if( argc==0 ) return;
-  tqmask = sqlite3_user_data(context)==0 ? 0 : -1;
+  mask = sqlite3_user_data(context)==0 ? 0 : -1;
   pColl = sqlite3GetFuncCollSeq(context);
   assert( pColl );
-  assert( tqmask==-1 || tqmask==0 );
+  assert( mask==-1 || mask==0 );
   iBest = 0;
   if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
   for(i=1; i<argc; i++){
     if( sqlite3_value_type(argv[i])==SQLITE_NULL ) return;
-    if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^tqmask)>=0 ){
+    if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^mask)>=0 ){
       iBest = i;
     }
   }
diff --git a/kexi/3rdparty/kexisql3/src/parse.c b/kexi/3rdparty/kexisql3/src/parse.c
index d763cb293..5eda3e3f1 100644
--- a/kexi/3rdparty/kexisql3/src/parse.c
+++ b/kexi/3rdparty/kexisql3/src/parse.c
@@ -106,7 +106,7 @@ typedef union {
   struct LikeOp yy222;
   IdList* yy240;
   int yy280;
-  struct {int value; int tqmask;} yy359;
+  struct {int value; int mask;} yy359;
   TriggerStep* yy360;
   struct AttachKey yy361;
   Select* yy375;
@@ -2164,27 +2164,27 @@ static void yy_reduce(
         break;
       case 65:
 #line 289 "parse.y"
-{ yygotominor.yy280 = (yymsp[-1].minor.yy280 & yymsp[0].minor.yy359.tqmask) | yymsp[0].minor.yy359.value; }
+{ yygotominor.yy280 = (yymsp[-1].minor.yy280 & yymsp[0].minor.yy359.mask) | yymsp[0].minor.yy359.value; }
 #line 2170 "parse.c"
         break;
       case 66:
 #line 291 "parse.y"
-{ yygotominor.yy359.value = 0;     yygotominor.yy359.tqmask = 0x000000; }
+{ yygotominor.yy359.value = 0;     yygotominor.yy359.mask = 0x000000; }
 #line 2175 "parse.c"
         break;
       case 67:
 #line 292 "parse.y"
-{ yygotominor.yy359.value = yymsp[0].minor.yy280;     yygotominor.yy359.tqmask = 0x0000ff; }
+{ yygotominor.yy359.value = yymsp[0].minor.yy280;     yygotominor.yy359.mask = 0x0000ff; }
 #line 2180 "parse.c"
         break;
       case 68:
 #line 293 "parse.y"
-{ yygotominor.yy359.value = yymsp[0].minor.yy280<<8;  yygotominor.yy359.tqmask = 0x00ff00; }
+{ yygotominor.yy359.value = yymsp[0].minor.yy280<<8;  yygotominor.yy359.mask = 0x00ff00; }
 #line 2185 "parse.c"
         break;
       case 69:
 #line 294 "parse.y"
-{ yygotominor.yy359.value = yymsp[0].minor.yy280<<16; yygotominor.yy359.tqmask = 0xff0000; }
+{ yygotominor.yy359.value = yymsp[0].minor.yy280<<16; yygotominor.yy359.mask = 0xff0000; }
 #line 2190 "parse.c"
         break;
       case 70:
diff --git a/kexi/3rdparty/kexisql3/src/parse.y b/kexi/3rdparty/kexisql3/src/parse.y
index 7487c731a..b92d22767 100644
--- a/kexi/3rdparty/kexisql3/src/parse.y
+++ b/kexi/3rdparty/kexisql3/src/parse.y
@@ -207,12 +207,12 @@ ccons ::= COLLATE id(C).  {sqlite3AddCollateType(pParse, C.z, C.n);}
 //
 %type refargs {int}
 refargs(A) ::= .                     { A = OE_Restrict * 0x010101; }
-refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.tqmask) | Y.value; }
-%type refarg {struct {int value; int tqmask;}}
-refarg(A) ::= MATCH nm.              { A.value = 0;     A.tqmask = 0x000000; }
-refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.tqmask = 0x0000ff; }
-refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.tqmask = 0x00ff00; }
-refarg(A) ::= ON INSERT refact(X).   { A.value = X<<16; A.tqmask = 0xff0000; }
+refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.mask) | Y.value; }
+%type refarg {struct {int value; int mask;}}
+refarg(A) ::= MATCH nm.              { A.value = 0;     A.mask = 0x000000; }
+refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.mask = 0x0000ff; }
+refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.mask = 0x00ff00; }
+refarg(A) ::= ON INSERT refact(X).   { A.value = X<<16; A.mask = 0xff0000; }
 %type refact {int}
 refact(A) ::= SET NULL.              { A = OE_SetNull; }
 refact(A) ::= SET DEFAULT.           { A = OE_SetDflt; }
diff --git a/kexi/3rdparty/kexisql3/src/pragma.c b/kexi/3rdparty/kexisql3/src/pragma.c
index 181d9a94e..c85c19d5c 100644
--- a/kexi/3rdparty/kexisql3/src/pragma.c
+++ b/kexi/3rdparty/kexisql3/src/pragma.c
@@ -142,7 +142,7 @@ static void returnSingleInt(Parse *pParse, const char *zLabel, int value){
 static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
   static const struct sPragmaType {
     const char *zName;  /* Name of the pragma */
-    int tqmask;           /* Mask for the db->flags value */
+    int mask;           /* Mask for the db->flags value */
   } aPragma[] = {
     { "vdbe_trace",               SQLITE_VdbeTrace     },
     { "sql_trace",                SQLITE_SqlTrace      },
@@ -164,12 +164,12 @@ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
       v = sqlite3GetVdbe(pParse);
       if( v ){
         if( zRight==0 ){
-          returnSingleInt(pParse, p->zName, (db->flags & p->tqmask)!=0 );
+          returnSingleInt(pParse, p->zName, (db->flags & p->mask)!=0 );
         }else{
           if( getBoolean(zRight) ){
-            db->flags |= p->tqmask;
+            db->flags |= p->mask;
           }else{
-            db->flags &= ~p->tqmask;
+            db->flags &= ~p->mask;
           }
         }
         /* If one of these pragmas is executed, any prepared statements
diff --git a/kexi/3rdparty/kexisql3/src/select.c b/kexi/3rdparty/kexisql3/src/select.c
index 13c38d509..7cb7b1765 100644
--- a/kexi/3rdparty/kexisql3/src/select.c
+++ b/kexi/3rdparty/kexisql3/src/select.c
@@ -1961,7 +1961,7 @@ static void substSelect(Select *p, int iTable, ExprList *pEList){
 */
 static int flattenSubquery(
   Parse *pParse,       /* The parsing context */
-  Select *p,           /* The tqparent or outer SELECT statement */
+  Select *p,           /* The parent or outer SELECT statement */
   int iFrom,           /* Index in p->pSrc->a[] of the inner subquery */
   int isAgg,           /* True if outer SELECT uses aggregate functions */
   int subqueryIsAgg    /* True if the subquery uses aggregate functions */
@@ -2322,7 +2322,7 @@ static int processOrderGroupBy(
 ** This routine resolves any names used in the result set of the
 ** supplied SELECT statement. If the SELECT statement being resolved
 ** is a sub-select, then pOuterNC is a pointer to the NameContext 
-** of the tqparent SELECT.
+** of the parent SELECT.
 */
 int sqlite3SelectResolve(
   Parse *pParse,         /* The parser context */
@@ -2571,8 +2571,8 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
 **
 ** The pParent, parentTab, and *pParentAgg fields are filled in if this
 ** SELECT is a subquery.  This routine may try to combine this SELECT
-** with its tqparent to form a single flat query.  In so doing, it might
-** change the tqparent query from a non-aggregate to an aggregate query.
+** with its parent to form a single flat query.  In so doing, it might
+** change the parent query from a non-aggregate to an aggregate query.
 ** For that reason, the pParentAgg flag is passed as a pointer, so it
 ** can be changed.
 **
@@ -2730,7 +2730,7 @@ int sqlite3Select(
     goto select_end;
   }
 
-  /* Check to see if this is a subquery that can be "flattened" into its tqparent.
+  /* Check to see if this is a subquery that can be "flattened" into its parent.
   ** If flattening is a possiblity, do so and return immediately.  
   */
 #ifndef SQLITE_OMIT_VIEW
@@ -3100,7 +3100,7 @@ int sqlite3Select(
 
 #ifndef SQLITE_OMIT_SUBTQUERY
   /* If this was a subquery, we have now converted the subquery into a
-  ** temporary table.  So delete the subquery structure from the tqparent
+  ** temporary table.  So delete the subquery structure from the parent
   ** to prevent this subquery from being evaluated again and to force the
   ** the use of the temporary table.
   */
diff --git a/kexi/3rdparty/kexisql3/src/sqliteInt.h b/kexi/3rdparty/kexisql3/src/sqliteInt.h
index 749168053..153b537bf 100644
--- a/kexi/3rdparty/kexisql3/src/sqliteInt.h
+++ b/kexi/3rdparty/kexisql3/src/sqliteInt.h
@@ -119,7 +119,7 @@
 ** The maximum number of attached databases.  This must be at least 2
 ** in order to support the main database file (0) and the file used to
 ** hold temporary tables (1).  And it must be less than 32 because
-** we use a bittqmask of databases with a u32 in places (for example
+** we use a bitmask of databases with a u32 in places (for example
 ** the Parse.cookieMask field).
 */
 #define MAX_ATTACHED 10
@@ -976,9 +976,9 @@ struct IdList {
 };
 
 /*
-** The bittqmask datatype defined below is used for various optimizations.
+** The bitmask datatype defined below is used for various optimizations.
 */
-typedef unsigned int Bittqmask;
+typedef unsigned int Bitmask;
 
 /*
 ** The following structure describes the FROM clause of a SELECT statement.
@@ -1004,7 +1004,7 @@ struct SrcList {
     i16 iCursor;      /* The VDBE cursor number used to access this table */
     Expr *pOn;        /* The ON clause of a join */
     IdList *pUsing;   /* The USING clause of a join */
-    Bittqmask colUsed;  /* Bit N (1<<N) set if column N or pTab is used */
+    Bitmask colUsed;  /* Bit N (1<<N) set if column N or pTab is used */
   } a[1];             /* One entry for each identifier on the list */
 };
 
@@ -1076,7 +1076,7 @@ struct WhereInfo {
 ** the context containing the match is incremented. 
 **
 ** Each subquery gets a new NameContext.  The pNext field points to the
-** NameContext in the tqparent query.  Thus the process of scanning the
+** NameContext in the parent query.  Thus the process of scanning the
 ** NameContext list corresponds to searching through successively outer
 ** subqueries looking for a match.
 */
@@ -1176,7 +1176,7 @@ struct Parse {
   int nMem;            /* Number of memory cells used so far */
   int nSet;            /* Number of sets used so far */
   u32 writeMask;       /* Start a write transaction on these databases */
-  u32 cookieMask;      /* Bittqmask of schema verified databases */
+  u32 cookieMask;      /* Bitmask of schema verified databases */
   int cookieGoto;      /* Address of OP_Goto to cookie verifier subroutine */
   int cookieValue[MAX_ATTACHED+2];  /* Values of cookies to verify */
 
@@ -1328,9 +1328,9 @@ struct TriggerStep {
  *
  * struct TriggerStack has a "pNext" member, to allow linked lists to be
  * constructed. When coding nested triggers (triggers fired by other triggers)
- * each nested trigger stores its tqparent trigger's TriggerStack as the "pNext" 
+ * each nested trigger stores its parent trigger's TriggerStack as the "pNext" 
  * pointer. Once the nested trigger has been coded, the pNext value is restored
- * to the pTriggerStack member of the Parse stucture and coding of the tqparent
+ * to the pTriggerStack member of the Parse stucture and coding of the parent
  * trigger continues.
  *
  * Before a nested trigger is coded, the linked list pointed to by the 
diff --git a/kexi/3rdparty/kexisql3/src/trigger.c b/kexi/3rdparty/kexisql3/src/trigger.c
index 610f50901..f39d2bd83 100644
--- a/kexi/3rdparty/kexisql3/src/trigger.c
+++ b/kexi/3rdparty/kexisql3/src/trigger.c
@@ -581,7 +581,7 @@ int sqlite3TriggersExist(
   ExprList *pChanges      /* Columns that change in an UPDATE statement */
 ){
   Trigger *pTrigger = pTab->pTrigger;
-  int tqmask = 0;
+  int mask = 0;
 
   while( pTrigger ){
     if( pTrigger->op==op && checkColumnOverLap(pTrigger->pColumns, pChanges) ){
@@ -591,12 +591,12 @@ int sqlite3TriggersExist(
 	ss = ss->pNext;
       }
       if( ss==0 ){
-        tqmask |= pTrigger->tr_tm;
+        mask |= pTrigger->tr_tm;
       }
     }
     pTrigger = pTrigger->pNext;
   }
-  return tqmask;
+  return mask;
 }
 
 /*
diff --git a/kexi/3rdparty/kexisql3/src/vdbe.c b/kexi/3rdparty/kexisql3/src/vdbe.c
index f46593715..8ff959461 100644
--- a/kexi/3rdparty/kexisql3/src/vdbe.c
+++ b/kexi/3rdparty/kexisql3/src/vdbe.c
@@ -1103,7 +1103,7 @@ case OP_CollSeq: {             /* no-push */
 ** defines the function) with P2 arguments taken from the stack.  Pop all
 ** arguments from the stack and push back the result.
 **
-** P1 is a 32-bit bittqmask indicating whether or not each argument to the 
+** P1 is a 32-bit bitmask indicating whether or not each argument to the 
 ** function was determined to be constant at compile time. If the first
 ** argument was constant then bit 0 of P1 is set. This is used to determine
 ** whether meta data associated with a user function argument using the
@@ -1421,7 +1421,7 @@ case OP_ToBlob: {                  /* no-push */
 ** whereas it would normally be NULL.  Similarly,  NULL==123 is false when
 ** 0x200 is set but is NULL when the 0x200 bit of P1 is clear.
 **
-** The least significant byte of P1 (tqmask 0xff) must be an affinity character -
+** The least significant byte of P1 (mask 0xff) must be an affinity character -
 ** 'n', 't', 'i' or 'o' - or 0x00. An attempt is made to coerce both values
 ** according to the affinity before the comparison is made. If the byte is
 ** 0x00, then numeric affinity is used.
@@ -2539,8 +2539,8 @@ case OP_OpenWrite: {       /* no-push */
     case SQLITE_OK: {
       int flags = sqlite3BtreeFlags(pCur->pCursor);
       /* Sanity checking.  Only the lower four bits of the flags byte should
-      ** be used.  Bit 3 (tqmask 0x08) is unpreditable.  The lower 3 bits
-      ** (tqmask 0x07) should be either 5 (intkey+leafdata for tables) or
+      ** be used.  Bit 3 (mask 0x08) is unpreditable.  The lower 3 bits
+      ** (mask 0x07) should be either 5 (intkey+leafdata for tables) or
       ** 2 (zerodata for indices).  If these conditions are not met it can
       ** only mean that we are dealing with a corrupt database file
       */
diff --git a/kexi/3rdparty/kexisql3/src/vdbeaux.c b/kexi/3rdparty/kexisql3/src/vdbeaux.c
index 1ff314d1a..cba9c096d 100644
--- a/kexi/3rdparty/kexisql3/src/vdbeaux.c
+++ b/kexi/3rdparty/kexisql3/src/vdbeaux.c
@@ -176,7 +176,7 @@ void sqlite3VdbeResolveLabel(Vdbe *p, int x){
 */
 static int opcodeNoPush(u8 op){
   /* The 10 NOPUSH_MASK_n constants are defined in the automatically
-  ** generated header file opcodes.h. Each is a 16-bit bittqmask, one
+  ** generated header file opcodes.h. Each is a 16-bit bitmask, one
   ** bit corresponding to each opcode implemented by the virtual
   ** machine in vdbe.c. The bit is true if the word "no-push" appears
   ** in a comment on the same line as the "case OP_XXX:" in 
@@ -1326,15 +1326,15 @@ int sqlite3VdbeFinalize(Vdbe *p){
 
 /*
 ** Call the destructor for each auxdata entry in pVdbeFunc for which
-** the corresponding bit in tqmask is clear.  Auxdata entries beyond 31
+** the corresponding bit in mask is clear.  Auxdata entries beyond 31
 ** are always destroyed.  To destroy all auxdata entries, call this
-** routine with tqmask==0.
+** routine with mask==0.
 */
-void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int tqmask){
+void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int mask){
   int i;
   for(i=0; i<pVdbeFunc->nAux; i++){
     struct AuxData *pAux = &pVdbeFunc->apAux[i];
-    if( (i>31 || !(tqmask&(1<<i))) && pAux->pAux ){
+    if( (i>31 || !(mask&(1<<i))) && pAux->pAux ){
       if( pAux->xDelete ){
         pAux->xDelete(pAux->pAux);
       }
diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c
index 54c8402ff..5ab2e4e67 100644
--- a/kexi/3rdparty/kexisql3/src/where.c
+++ b/kexi/3rdparty/kexisql3/src/where.c
@@ -21,9 +21,9 @@
 #include "sqliteInt.h"
 
 /*
-** The number of bits in a Bittqmask.  "BMS" means "BitMask Size".
+** The number of bits in a Bitmask.  "BMS" means "BitMask Size".
 */
-#define BMS  (sizeof(Bittqmask)*8)
+#define BMS  (sizeof(Bitmask)*8)
 
 /*
 ** Determine the number of elements in an array.
@@ -61,20 +61,20 @@ typedef struct WhereClause WhereClause;
 ** where X is a column name and <op> is one of certain operators,
 ** then WhereTerm.leftCursor and WhereTerm.leftColumn record the
 ** cursor number and column number for X.  WhereTerm.operator records
-** the <op> using a bittqmask encoding defined by WO_xxx below.  The
-** use of a bittqmask encoding for the operator allows us to search
+** the <op> using a bitmask encoding defined by WO_xxx below.  The
+** use of a bitmask encoding for the operator allows us to search
 ** quickly for terms that match any of several different operators.
 **
 ** prereqRight and prereqAll record sets of cursor numbers,
 ** but they do so indirectly.  A single ExprMaskSet structure translates
 ** cursor number into bits and the translated bit is stored in the prereq
 ** fields.  The translation is used in order to maximize the number of
-** bits that will fit in a Bittqmask.  The VDBE cursor numbers might be
+** bits that will fit in a Bitmask.  The VDBE cursor numbers might be
 ** spread out over the non-negative integers.  For example, the cursor
 ** numbers might be 3, 8, 9, 10, 20, 23, 41, and 45.  The ExprMaskSet
 ** translates these sparse cursor numbers into consecutive integers
 ** beginning with 0 in order to make the best possible use of the available
-** bits in the Bittqmask.  So, in the example above, the cursor numbers
+** bits in the Bitmask.  So, in the example above, the cursor numbers
 ** would be mapped into integers 0 through 7.
 */
 typedef struct WhereTerm WhereTerm;
@@ -87,8 +87,8 @@ struct WhereTerm {
   u8 flags;               /* Bit flags.  See below */
   u8 nChild;              /* Number of tqchildren that must disable us */
   WhereClause *pWC;       /* The clause this term is part of */
-  Bittqmask prereqRight;    /* Bittqmask of tables used by pRight */
-  Bittqmask prereqAll;      /* Bittqmask of tables referenced by p */
+  Bitmask prereqRight;    /* Bitmask of tables used by pRight */
+  Bitmask prereqAll;      /* Bitmask of tables referenced by p */
 };
 
 /*
@@ -124,8 +124,8 @@ struct WhereClause {
 ** from the sparse cursor numbers into consecutive integers beginning
 ** with 0.
 **
-** If ExprMaskSet.ix[A]==B it means that The A-th bit of a Bittqmask
-** corresponds VDBE cursor number B.  The A-th bit of a bittqmask is 1<<A.
+** If ExprMaskSet.ix[A]==B it means that The A-th bit of a Bitmask
+** corresponds VDBE cursor number B.  The A-th bit of a bitmask is 1<<A.
 **
 ** For example, if the WHERE clause expression used these VDBE
 ** cursors:  4, 5, 8, 29, 57, 73.  Then the  ExprMaskSet structure
@@ -141,7 +141,7 @@ struct WhereClause {
 typedef struct ExprMaskSet ExprMaskSet;
 struct ExprMaskSet {
   int n;                        /* Number of assigned cursor values */
-  int ix[sizeof(Bittqmask)*8];    /* Cursor assigned to each bit */
+  int ix[sizeof(Bitmask)*8];    /* Cursor assigned to each bit */
 };
 
 
@@ -258,26 +258,26 @@ static void whereSplit(WhereClause *pWC, Expr *pExpr, int op){
 }
 
 /*
-** Initialize an expression tqmask set
+** Initialize an expression mask set
 */
 #define initMaskSet(P)  memset(P, 0, sizeof(*P))
 
 /*
-** Return the bittqmask for the given cursor number.  Return 0 if
+** Return the bitmask for the given cursor number.  Return 0 if
 ** iCursor is not in the set.
 */
-static Bittqmask getMask(ExprMaskSet *pMaskSet, int iCursor){
+static Bitmask getMask(ExprMaskSet *pMaskSet, int iCursor){
   int i;
   for(i=0; i<pMaskSet->n; i++){
     if( pMaskSet->ix[i]==iCursor ){
-      return ((Bittqmask)1)<<i;
+      return ((Bitmask)1)<<i;
     }
   }
   return 0;
 }
 
 /*
-** Create a new tqmask for cursor iCursor.
+** Create a new mask for cursor iCursor.
 **
 ** There is one cursor per table in the FROM clause.  The number of
 ** tables in the FROM clause is limited by a test early in the
@@ -291,7 +291,7 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){
 
 /*
 ** This routine walks (recursively) an expression tree and generates
-** a bittqmask indicating which tables are used in that expression
+** a bitmask indicating which tables are used in that expression
 ** tree.
 **
 ** In order for this routine to work, the calling function must have
@@ -300,46 +300,46 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){
 ** The sqlite3ExprResolveNames() routines looks for column names and
 ** sets their opcodes to TK_COLUMN and their Expr.iTable fields to
 ** the VDBE cursor number of the table.  This routine just has to
-** translate the cursor numbers into bittqmask values and OR all
+** translate the cursor numbers into bitmask values and OR all
 ** the bitmasks together.
 */
-static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*);
-static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*);
-static Bittqmask exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){
-  Bittqmask tqmask = 0;
+static Bitmask exprListTableUsage(ExprMaskSet*, ExprList*);
+static Bitmask exprSelectTableUsage(ExprMaskSet*, Select*);
+static Bitmask exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){
+  Bitmask mask = 0;
   if( p==0 ) return 0;
   if( p->op==TK_COLUMN ){
-    tqmask = getMask(pMaskSet, p->iTable);
-    return tqmask;
+    mask = getMask(pMaskSet, p->iTable);
+    return mask;
   }
-  tqmask = exprTableUsage(pMaskSet, p->pRight);
-  tqmask |= exprTableUsage(pMaskSet, p->pLeft);
-  tqmask |= exprListTableUsage(pMaskSet, p->pList);
-  tqmask |= exprSelectTableUsage(pMaskSet, p->pSelect);
-  return tqmask;
+  mask = exprTableUsage(pMaskSet, p->pRight);
+  mask |= exprTableUsage(pMaskSet, p->pLeft);
+  mask |= exprListTableUsage(pMaskSet, p->pList);
+  mask |= exprSelectTableUsage(pMaskSet, p->pSelect);
+  return mask;
 }
-static Bittqmask exprListTableUsage(ExprMaskSet *pMaskSet, ExprList *pList){
+static Bitmask exprListTableUsage(ExprMaskSet *pMaskSet, ExprList *pList){
   int i;
-  Bittqmask tqmask = 0;
+  Bitmask mask = 0;
   if( pList ){
     for(i=0; i<pList->nExpr; i++){
-      tqmask |= exprTableUsage(pMaskSet, pList->a[i].pExpr);
+      mask |= exprTableUsage(pMaskSet, pList->a[i].pExpr);
     }
   }
-  return tqmask;
+  return mask;
 }
-static Bittqmask exprSelectTableUsage(ExprMaskSet *pMaskSet, Select *pS){
-  Bittqmask tqmask;
+static Bitmask exprSelectTableUsage(ExprMaskSet *pMaskSet, Select *pS){
+  Bitmask mask;
   if( pS==0 ){
-    tqmask = 0;
+    mask = 0;
   }else{
-    tqmask = exprListTableUsage(pMaskSet, pS->pEList);
-    tqmask |= exprListTableUsage(pMaskSet, pS->pGroupBy);
-    tqmask |= exprListTableUsage(pMaskSet, pS->pOrderBy);
-    tqmask |= exprTableUsage(pMaskSet, pS->pWhere);
-    tqmask |= exprTableUsage(pMaskSet, pS->pHaving);
+    mask = exprListTableUsage(pMaskSet, pS->pEList);
+    mask |= exprListTableUsage(pMaskSet, pS->pGroupBy);
+    mask |= exprListTableUsage(pMaskSet, pS->pOrderBy);
+    mask |= exprTableUsage(pMaskSet, pS->pWhere);
+    mask |= exprTableUsage(pMaskSet, pS->pHaving);
   }
-  return tqmask;
+  return mask;
 }
 
 /*
@@ -379,7 +379,7 @@ static void exprCommute(Expr *pExpr){
 }
 
 /*
-** Translate from TK_xx operator to WO_xx bittqmask.
+** Translate from TK_xx operator to WO_xx bitmask.
 */
 static int operatorMask(int op){
   int c;
@@ -408,7 +408,7 @@ static WhereTerm *findTerm(
   WhereClause *pWC,     /* The WHERE clause to be searched */
   int iCur,             /* Cursor number of LHS */
   int iColumn,          /* Column number of LHS */
-  Bittqmask notReady,     /* RHS must not overlap with this tqmask */
+  Bitmask notReady,     /* RHS must not overlap with this mask */
   u16 op,               /* Mask of WO_xx values describing operator */
   Index *pIdx           /* Must be compatible with this index, if not NULL */
 ){
@@ -542,8 +542,8 @@ static void exprAnalyze(
 ){
   WhereTerm *pTerm = &pWC->a[idxTerm];
   Expr *pExpr = pTerm->pExpr;
-  Bittqmask prereqLeft;
-  Bittqmask prereqAll;
+  Bitmask prereqLeft;
+  Bitmask prereqAll;
   int nPattern;
   int isComplete;
 
@@ -885,7 +885,7 @@ static double bestIndex(
   Parse *pParse,              /* The parsing context */
   WhereClause *pWC,           /* The WHERE clause */
   struct SrcList_item *pSrc,  /* The FROM clause term to search */
-  Bittqmask notReady,           /* Mask of cursors that are not available */
+  Bitmask notReady,           /* Mask of cursors that are not available */
   ExprList *pOrderBy,         /* The order by clause */
   Index **ppIndex,            /* Make *ppIndex point to the best index */
   int *pFlags,                /* Put flags describing this choice in *pFlags */
@@ -1052,13 +1052,13 @@ static double bestIndex(
     ** ever reading the table.  If that is the case, then halve the
     ** cost of this index.
     */
-    if( flags && pSrc->colUsed < (((Bittqmask)1)<<(BMS-1)) ){
-      Bittqmask m = pSrc->colUsed;
+    if( flags && pSrc->colUsed < (((Bitmask)1)<<(BMS-1)) ){
+      Bitmask m = pSrc->colUsed;
       int j;
       for(j=0; j<pProbe->nColumn; j++){
         int x = pProbe->aiColumn[j];
         if( x<BMS-1 ){
-          m &= ~(((Bittqmask)1)<<x);
+          m &= ~(((Bitmask)1)<<x);
         }
       }
       if( m==0 ){
@@ -1223,7 +1223,7 @@ static void codeAllEqualityTerms(
   Parse *pParse,        /* Parsing context */
   WhereLevel *pLevel,   /* Which nested loop of the FROM we are coding */
   WhereClause *pWC,     /* The WHERE clause */
-  Bittqmask notReady,     /* Which parts of FROM have not yet been coded */
+  Bitmask notReady,     /* Which parts of FROM have not yet been coded */
   int brk               /* Jump here to end the loop */
 ){
   int nEq = pLevel->nEq;        /* The number of == or IN constraints to code */
@@ -1380,9 +1380,9 @@ WhereInfo *sqlite3WhereBegin(
   WhereInfo *pWInfo;         /* Will become the return value of this function */
   Vdbe *v = pParse->pVdbe;   /* The virtual database engine */
   int brk, cont = 0;         /* Addresses used during code generation */
-  Bittqmask notReady;          /* Cursors that are not yet positioned */
+  Bitmask notReady;          /* Cursors that are not yet positioned */
   WhereTerm *pTerm;          /* A single term in the WHERE clause */
-  ExprMaskSet maskSet;       /* The expression tqmask set */
+  ExprMaskSet maskSet;       /* The expression mask set */
   WhereClause wc;            /* The WHERE clause is divided into these terms */
   struct SrcList_item *pTabItem;  /* A single entry from pTabList */
   WhereLevel *pLevel;             /* A single level in the pWInfo list */
@@ -1390,7 +1390,7 @@ WhereInfo *sqlite3WhereBegin(
   int andFlags;              /* AND-ed combination of all wc.a[].flags */
 
   /* The number of tables in the FROM clause is limited by the number of
-  ** bits in a Bittqmask 
+  ** bits in a Bitmask 
   */
   if( pTabList->nSrc>BMS ){
     sqlite3ErrorMsg(pParse, "at most %d tables in a join", BMS);
@@ -1450,7 +1450,7 @@ WhereInfo *sqlite3WhereBegin(
   ** This loop also figures out the nesting order of tables in the FROM
   ** clause.
   */
-  notReady = ~(Bittqmask)0;
+  notReady = ~(Bitmask)0;
   pTabItem = pTabList->a;
   pLevel = pWInfo->a;
   andFlags = ~0;
@@ -1466,7 +1466,7 @@ WhereInfo *sqlite3WhereBegin(
     int bestNEq = 0;            /* nEq associated with pBest */
     double lowestCost = 1.0e99; /* Cost of the pBest */
     int bestJ;                  /* The value of j */
-    Bittqmask m;                  /* Bittqmask value for j or bestJ */
+    Bitmask m;                  /* Bitmask value for j or bestJ */
 
     for(j=iFrom, pTabItem=&pTabList->a[j]; j<pTabList->nSrc; j++, pTabItem++){
       m = getMask(&maskSet, pTabItem->iCursor);
@@ -1566,7 +1566,7 @@ WhereInfo *sqlite3WhereBegin(
   ** loop below generates code for a single nested loop of the VM
   ** program.
   */
-  notReady = ~(Bittqmask)0;
+  notReady = ~(Bitmask)0;
   for(i=0, pLevel=pWInfo->a; i<pTabList->nSrc; i++, pLevel++){
     int j;
     int iCur = pTabItem->iCursor;  /* The VDBE cursor for the table */
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
index 60057c88e..8ea3b0b96 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
@@ -25,8 +25,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *tqparent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
-    : KoPageLayoutColumnsBase(tqparent) {
+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", tqlayout );
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
index 09bad9d5c..8ebac1b2e 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
@@ -40,12 +40,12 @@ class KoPageLayoutColumns : public KoPageLayoutColumnsBase {
 public:
     /**
      * Contructor
-     * @param tqparent the tqparent widget
+     * @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 tqlayout the page tqlayout that the preview should be initialzed with.
      */
-    KoPageLayoutColumns(TQWidget *tqparent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
+    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
 
     /**
      * Update the page preview widget with the param tqlayout.
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
index b436447b3..002969573 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
@@ -23,8 +23,8 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *tqparent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf)
-    : KoPageLayoutHeaderBase(tqparent) {
+KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf)
+    : KoPageLayoutHeaderBase(parent) {
     m_headerFooters = kwhf;
     TQHBoxLayout *lay = new TQHBoxLayout(headerSpacingPane);
     m_headerSpacing = new KoUnitDoubleSpinBox( headerSpacingPane, 0.0, 999.0, 0.5, kwhf.ptHeaderBodySpacing, unit );
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeader.h b/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
index de8db04b6..1f1e80730 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
@@ -32,7 +32,7 @@ class KoPageLayoutHeader : public KoPageLayoutHeaderBase {
   TQ_OBJECT
 
 public:
-    KoPageLayoutHeader(TQWidget *tqparent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf);
+    KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf);
     const KoKWHeaderFooter& headerFooter();
 
 private:
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index c83c381e1..649f4c26f 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -33,8 +33,8 @@
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h>
 
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *tqparent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
-    : TQWidget(tqparent) {
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
+    : TQWidget(parent) {
     m_layout = tqlayout;
     m_unit = unit;
 
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.h b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
index 5d7c0494b..06c08517f 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
@@ -41,14 +41,14 @@ class KoPageLayoutSize : public TQWidget {
 public:
     /**
      * Contructor
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @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 *tqparent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
+    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
             const KoColumns& columns, bool unitChooser, bool enableBorders);
 
     /**
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
index 991a2ced7..d81d18707 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
@@ -49,8 +49,8 @@
 /******************************************************************/
 
 /*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* tqparent, const char *name, const KoPageLayout& tqlayout )
-    : TQGroupBox( i18n( "Page Preview" ), tqparent, name )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
+    : TQGroupBox( i18n( "Page Preview" ), parent, name )
 {
     setPageLayout( tqlayout );
     columns = 1;
@@ -128,12 +128,12 @@ void KoPagePreview::drawContents( TQPainter *painter )
 /******************************************************************/
 
 /*==================== constructor ===============================*/
-KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name,
+KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
                                   const KoPageLayout& tqlayout,
                                   const KoHeadFoot& hf, int tabs,
                                   KoUnit::Unit unit, bool modal )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
-                   KDialogBase::Ok, tqparent, name, modal)
+                   KDialogBase::Ok, parent, name, modal)
 {
 
     flags = tabs;
@@ -153,14 +153,14 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name,
 }
 
 /*==================== constructor ===============================*/
-KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name,
+KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
                   const KoPageLayout& tqlayout,
                   const KoHeadFoot& hf,
                   const KoColumns& columns,
                   const KoKWHeaderFooter& kwhf,
                   int tabs, KoUnit::Unit unit )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
-                   KDialogBase::Ok, tqparent, name, true)
+                   KDialogBase::Ok, parent, name, true)
 {
     flags = tabs;
 
@@ -186,10 +186,10 @@ KoPageLayoutDia::~KoPageLayoutDia()
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* tqparent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( tqparent, "PageLayout", tqlayout, hf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
@@ -205,10 +205,10 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta
 
 /*======================= show dialog ============================*/
 bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
-                                  KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* tqparent )
+                                  KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( tqparent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.h b/kexi/3rdparty/kolibs/koPageLayoutDia.h
index 05f8f3db7..21fe7df34 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.h
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.h
@@ -90,7 +90,7 @@ public:
     /**
      *  Constructor.
      *
-     *  @param tqparent   The tqparent of the dialog.
+     *  @param parent   The parent of the dialog.
      *  @param name     The name of the dialog.
      *  @param tqlayout   The tqlayout.
      *  @param headfoot The header and the footer.
@@ -98,7 +98,7 @@ public:
      *  @param unit     The unit to use for displaying the values to the user.
      *  @param modal    Whether the dialog is modal or not.
      */
-    KoPageLayoutDia( TQWidget* tqparent, const char* name,
+    KoPageLayoutDia( TQWidget* parent, const char* name,
              const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              int flags, KoUnit::Unit unit, bool modal=true );
@@ -106,7 +106,7 @@ public:
     /**
      *  Constructor.
      *
-     *  @param tqparent     The tqparent of the dialog.
+     *  @param parent     The parent of the dialog.
      *  @param name       The name of the dialog.
      *  @param tqlayout     The tqlayout.
      *  @param headfoot   The header and the footer.
@@ -115,7 +115,7 @@ public:
      *  @param tabs       The number of tabs.
      *  @param unit       The unit to use for displaying the values to the user
      */
-    KoPageLayoutDia( TQWidget* tqparent, const char* name,
+    KoPageLayoutDia( TQWidget* parent, const char* name,
              const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              const KoColumns& columns,
@@ -131,13 +131,13 @@ public:
      *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
-    static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* tqparent = 0 );
+    static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
 
     /**
      *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
-    static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* tqparent = 0 );
+    static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
     /**
      *  Retrieves a standard page tqlayout.
      *  Deprecated: better use KoPageLayout::standardLayout()
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 21251b812..16ec9a557 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -30,8 +30,8 @@
 //                          Support classes
 
 
-KoUnitDoubleValidator::KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *tqparent, const char *name )
-: KDoubleValidator( tqparent, name ), m_base( base )
+KoUnitDoubleValidator::KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *parent, const char *name )
+: KDoubleValidator( parent, name ), m_base( base )
 {
 }
 
@@ -116,8 +116,8 @@ double KoUnitDoubleBase::toDouble( const TQString& str, bool* ok ) const
 //                          Widget classes
 
 
-KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, const char *name )
-    : KDoubleSpinBox( tqparent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 )
+KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name )
+    : KDoubleSpinBox( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 )
     , m_lowerInPoints( -9999 )
     , m_upperInPoints( 9999 )
     , m_stepInPoints( 1 )
@@ -132,14 +132,14 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, const char *name )
 }
 
 
-KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, 
+KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, 
 						    double lower, double upper,
 						    double step, 
 						    double value, 
 						    KoUnit::Unit unit, 
 						    unsigned int precision, 
 						    const char *name )
-    : KDoubleSpinBox( lower, upper, step, value, precision, tqparent, name ),
+    : KDoubleSpinBox( lower, upper, step, value, precision, parent, name ),
       KoUnitDoubleBase( unit, precision ),
     m_lowerInPoints( lower ), m_upperInPoints( upper ), m_stepInPoints( step )
 {
@@ -218,8 +218,8 @@ void KoUnitDoubleSpinBox::setMinMaxStep( double min, double max, double step )
 // ----------------------------------------------------------------
 
 
-KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, const char *name )
-    : KLineEdit( tqparent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ),
+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 )
 {
     tqsetAlignment( TQt::AlignRight );
@@ -229,9 +229,9 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, const char *name
     changeValue(  KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) );
 }
 
-KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, double lower, double upper, double value, KoUnit::Unit unit,
+KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit,
     unsigned int precision, const char *name )
-    : KLineEdit( tqparent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
+    : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
     m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     tqsetAlignment( TQt::AlignRight );
@@ -283,8 +283,8 @@ double KoUnitDoubleLineEdit::value( void ) const
 // ----------------------------------------------------------------
 
 
-KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, const char *name )
-     : KComboBox( true, tqparent, 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 )
+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()->tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
@@ -294,9 +294,9 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, const char *name
     connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
 }
 
-KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, double lower, double upper, double value, KoUnit::Unit unit,
+KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit,
      unsigned int precision, const char *name )
-     : KComboBox( true, tqparent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
+     : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
      m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     lineEdit()->tqsetAlignment( TQt::AlignRight );
@@ -375,8 +375,8 @@ double KoUnitDoubleComboBox::value( void ) const
 // ----------------------------------------------------------------
 
 
-KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, const char *name )
-    : TQWidget( tqparent ), m_step( 1.0 )
+KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name )
+    : TQWidget( parent ), m_step( 1.0 )
 {
     TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
     //tqlayout->setMargin( 2 );
@@ -398,9 +398,9 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, const ch
     tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
-KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, double lower, double upper, double step, double value,
+KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value,
                                                     KoUnit::Unit unit, unsigned int precision, const char *name )
-    : TQWidget( tqparent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
+    : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
     //tqlayout->setMargin( 2 );
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.h b/kexi/3rdparty/kolibs/koUnitWidgets.h
index dbdcb9c0c..80db554d1 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.h
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.h
@@ -44,7 +44,7 @@ class KoUnitDoubleBase;
 class KOFFICEUI_EXPORT KoUnitDoubleValidator : public KDoubleValidator
 {
 public:
-    KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *tqparent, const char *name = 0 );
+    KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *parent, const char *name = 0 );
 
     virtual TQValidator::State validate( TQString &, int & ) const;
 
@@ -109,9 +109,9 @@ class KOFFICEUI_EXPORT KoUnitDoubleSpinBox : public KDoubleSpinBox, public KoUni
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleSpinBox( TQWidget *tqparent = 0L, const char *name = 0L );
+    KoUnitDoubleSpinBox( TQWidget *parent = 0L, const char *name = 0L );
     // lower, upper, step and value are in pt
-    KoUnitDoubleSpinBox( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0,
+    KoUnitDoubleSpinBox( TQWidget *parent, double lower, double upper, double step, double value = 0.0,
                          KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
     // added so the class can be used in .ui files(by Tymoteusz Majewski, maju7@o2.pl)
     virtual void changeValue( double );
@@ -136,7 +136,7 @@ public:
     void setMinMaxStep( double min, double max, double step );
 
 signals:
-    /// emitted like valueChanged in the tqparent, but this one emits the point value
+    /// emitted like valueChanged in the parent, but this one emits the point value
     void valueChangedPt( double );
 
 
@@ -160,8 +160,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleLineEdit : public KLineEdit, public KoUnitDou
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleLineEdit( TQWidget *tqparent = 0L, const char *name = 0L );
-    KoUnitDoubleLineEdit( TQWidget *tqparent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
+    KoUnitDoubleLineEdit( TQWidget *parent = 0L, const char *name = 0L );
+    KoUnitDoubleLineEdit( TQWidget *parent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
 
     virtual void changeValue( double );
     virtual void setUnit( KoUnit::Unit = KoUnit::U_PT );
@@ -189,8 +189,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleComboBox : public KComboBox, public KoUnitDou
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleComboBox( TQWidget *tqparent = 0L, const char *name = 0L );
-    KoUnitDoubleComboBox( TQWidget *tqparent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
+    KoUnitDoubleComboBox( TQWidget *parent = 0L, const char *name = 0L );
+    KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
 
     virtual void changeValue( double );
     void updateValue( double );
@@ -226,8 +226,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleSpinComboBox : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleSpinComboBox( TQWidget *tqparent = 0L, const char *name = 0L );
-    KoUnitDoubleSpinComboBox( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
+    KoUnitDoubleSpinComboBox( TQWidget *parent = 0L, const char *name = 0L );
+    KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
 
     void insertItem( double, int index = -1 );
     void updateValue( double );
diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h
index a98f93413..426854e64 100644
--- a/kexi/core/kexi.h
+++ b/kexi/core/kexi.h
@@ -42,7 +42,7 @@ namespace Kexi
 	enum ViewMode { 
 		AllViewModes = 0, //!< Usable primarily in KexiPart::initInstanceActions()
 		NoViewMode = 0, //!< In KexiViewBase::afterSwitchFrom() and KexiViewBase::beforeSwitchTo() 
-		                //!< means that tqparent dialog of the view has not yet view defined.
+		                //!< means that parent dialog of the view has not yet view defined.
 		DataViewMode = 1,
 		DesignViewMode = 2,
 		TextViewMode = 4 //!< Also known as SQL View Mode
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp
index 4b77b9ef2..49cbeb3b7 100644
--- a/kexi/core/kexiactionproxy.cpp
+++ b/kexi/core/kexiactionproxy.cpp
@@ -97,7 +97,7 @@ KexiActionProxy::~KexiActionProxy()
 	for (;it.current();++it) {
 		it.current()->setActionProxyParent_internal( 0 );
 	}
-	//take me from tqparent
+	//take me from parent
 	if (m_actionProxyParent)
 		m_actionProxyParent->takeActionProxyChild( this );
 
@@ -158,7 +158,7 @@ KAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQStri
 	TQCString altName = a->name();
 	altName += "_alt";
 	KAction *alt_act = new KAction(alternativeText, a->iconSet(), a->shortcut(), 
-		0, 0, a->tqparent(), altName);
+		0, 0, a->parent(), altName);
 	TQObject::connect(alt_act, TQT_SIGNAL(activated()), a, TQT_SLOT(activate()));
 	alt_act->plug(w);
 
@@ -201,7 +201,7 @@ bool KexiActionProxy::activateSharedAction(const char *action_name, bool alsoChe
 					return true;
 			}
 		}
-		return m_actionProxyParent ? m_actionProxyParent->activateSharedAction(action_name, false) : false; //last chance: tqparent
+		return m_actionProxyParent ? m_actionProxyParent->activateSharedAction(action_name, false) : false; //last chance: parent
 	}
 	//activate in this proxy...
 	p->first->activate();
@@ -244,7 +244,7 @@ bool KexiActionProxy::isAvailable(const char* action_name, bool alsoCheckInChild
 					return it.current()->isAvailable(action_name, alsoCheckInChildren);
 			}
 		}
-		return m_actionProxyParent ? m_actionProxyParent->isAvailable(action_name, false) : false; //last chance: tqparent
+		return m_actionProxyParent ? m_actionProxyParent->isAvailable(action_name, false) : false; //last chance: parent
 	}
 	//supported explicitly:
 	return p->second != 0;
@@ -273,9 +273,9 @@ void KexiActionProxy::takeActionProxyChild( KexiActionProxy* child )
 		m_sharedActionChildren.take();
 }
 
-void KexiActionProxy::setActionProxyParent_internal( KexiActionProxy* tqparent )
+void KexiActionProxy::setActionProxyParent_internal( KexiActionProxy* parent )
 {
-	m_actionProxyParent = tqparent;
+	m_actionProxyParent = parent;
 }
 
 #include "kexiactionproxy_p.moc"
diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h
index e88a89d9e..facb09b3d 100644
--- a/kexi/core/kexiactionproxy.h
+++ b/kexi/core/kexiactionproxy.h
@@ -153,8 +153,8 @@ class KEXICORE_EXPORT KexiActionProxy
 		 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 tqparent proxy. 
-		 Parent proxy is 0 by default. This pointer is properly cleared when tqparent proxy is destroyed. */
+		 If proxy child is destroyed, it is automatically detached from its parent proxy. 
+		 Parent proxy is 0 by default. This pointer is properly cleared when parent proxy is destroyed. */
 		void addActionProxyChild( KexiActionProxy* child );
 
 		void takeActionProxyChild( KexiActionProxy* child );
@@ -169,14 +169,14 @@ class KEXICORE_EXPORT KexiActionProxy
 
 		KexiActionProxy* m_actionProxyParent;
 
-		TQObject m_signal_parent; //!< it's just to have common tqparent for owned signals
+		TQObject m_signal_parent; //!< it's just to have common parent for owned signals
 
 		//! For internal use by plugSharedActionToExternalGUI()
 		KAction_setEnabled_Helper *m_KAction_setEnabled_helper;
 
 	public:
-		//! For internal use by addActionProxyChild(). \a tqparent can be 0.
-		void setActionProxyParent_internal( KexiActionProxy* tqparent );
+		//! For internal use by addActionProxyChild(). \a parent can be 0.
+		void setActionProxyParent_internal( KexiActionProxy* parent );
 
 		//! @internal
 		KexiActionProxy *m_focusedChild;
diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp
index 48bf6b516..e806aaafb 100644
--- a/kexi/core/kexicontexthelp.cpp
+++ b/kexi/core/kexicontexthelp.cpp
@@ -27,8 +27,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
-KexiContextHelp::KexiContextHelp(KexiMainWindow *view, TQWidget *tqparent)
-	:KoContextHelpWidget(tqparent,"kexi_contexthelp")
+KexiContextHelp::KexiContextHelp(KexiMainWindow *view, TQWidget *parent)
+	:KoContextHelpWidget(parent,"kexi_contexthelp")
 {
 	kdDebug()<<"KexiContextHelp::KexiContextHelp()"<<endl;
 	setCaption(i18n("Context Help"));
diff --git a/kexi/core/kexicontexthelp.h b/kexi/core/kexicontexthelp.h
index c1cd2a0b3..d28c8e2a3 100644
--- a/kexi/core/kexicontexthelp.h
+++ b/kexi/core/kexicontexthelp.h
@@ -30,7 +30,7 @@ class KEXICORE_EXPORT KexiContextHelp : public KoContextHelpWidget
   TQ_OBJECT
 
 	public:
-		KexiContextHelp(KexiMainWindow *view, TQWidget *tqparent=0);
+		KexiContextHelp(KexiMainWindow *view, TQWidget *parent=0);
 		~KexiContextHelp();
 	private slots:
 		void linkClickedInternal(const TQString &link);
diff --git a/kexi/core/kexidataiteminterface.h b/kexi/core/kexidataiteminterface.h
index ad3a3d25a..1c87e0e0a 100644
--- a/kexi/core/kexidataiteminterface.h
+++ b/kexi/core/kexidataiteminterface.h
@@ -188,7 +188,7 @@ class KEXICORE_EXPORT KexiDataItemInterface
 		bool cursorAtNewRow();
 
 		/*! Sets a pointer to a Parent Data Item Interface. This pointer is 0 by default, 
-		 but can be set by tqparent widget if this interface is a building block of a larger data widget. 
+		 but can be set by parent widget if this interface is a building block of a larger data widget. 
 		 It is the case for KexiDBFieldEdit widget (see KexiDBFieldEdit::createEditor()). Use with care.
 		 signalValueChanged() method will check this pointer, and if it's not 0, 
 		 m_parentDataItemInterface->signalValueChanged() is called, so a changes can be signalled at higher level. */
@@ -222,8 +222,8 @@ class KEXICORE_EXPORT KexiDataItemInterface
 //		virtual void setValueInternal(const TQVariant& value) = 0;
 
 		/*! Call this in your implementation when value changes, 
-		 so installed listener can react on this change. If there is a tqparent data item defined
-		 (see setParentDataItemInterface()), tqparent's signalValueChanged() method will be called instead. */
+		 so installed listener can react on this change. If there is a parent data item defined
+		 (see setParentDataItemInterface()), parent's signalValueChanged() method will be called instead. */
 		virtual void signalValueChanged();
 
 		/*! Used to perform some actions before signalValueChanged() call. 
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 01f20d8c6..ff642741a 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -41,9 +41,9 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 
-KexiDialogBase::KexiDialogBase(KexiMainWindow *tqparent, const TQString &caption)
- : KMdiChildView(caption, tqparent, "KexiDialogBase")
- , KexiActionProxy(TQT_TQOBJECT(this), tqparent)
+KexiDialogBase::KexiDialogBase(KexiMainWindow *parent, const TQString &caption)
+ : KMdiChildView(caption, parent, "KexiDialogBase")
+ , KexiActionProxy(TQT_TQOBJECT(this), parent)
  , m_isRegistered(false)
  , m_origCaption(caption)
  , m_schemaData(0)
@@ -54,7 +54,7 @@ KexiDialogBase::KexiDialogBase(KexiMainWindow *tqparent, const TQString &caption
 	m_supportedViewModes = 0; //will be set by KexiPart
 	m_openedViewModes = 0;
 	m_currentViewMode = Kexi::NoViewMode; //no view available yet
-	m_parentWindow = tqparent;
+	m_parentWindow = parent;
 	m_creatingViewsMode = -1;
 
 	TQVBoxLayout *lyr = new TQVBoxLayout(this);
@@ -64,7 +64,7 @@ KexiDialogBase::KexiDialogBase(KexiMainWindow *tqparent, const TQString &caption
 #ifdef KEXI_NO_CTXT_HELP
 	m_contextHelpInfo=new KexiContextHelpInfo();
 #endif
-//	m_instance=tqparent->instance();
+//	m_instance=parent->instance();
 	m_id = -1;
 	m_item = 0;
 
diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h
index 6479ae5b9..6449004b8 100644
--- a/kexi/core/kexidialogbase.h
+++ b/kexi/core/kexidialogbase.h
@@ -49,8 +49,8 @@ namespace KoProperty {
 class KEXICORE_EXPORT KexiDialogTempData : public TQObject
 {
 	public:
-	KexiDialogTempData(TQObject* tqparent)
-	 : TQObject(tqparent, "KexiDialogTempData")
+	KexiDialogTempData(TQObject* parent)
+	 : TQObject(parent, "KexiDialogTempData")
 	 , proposeOpeningInTextViewModeBecauseOfProblems(false)
 	{}
 	/*! Initially false, KexiPart::Part implementation can set this to true
@@ -81,7 +81,7 @@ class KEXICORE_EXPORT KexiDialogBase :
   TQ_OBJECT
 
 	public:
-		KexiDialogBase(KexiMainWindow *tqparent, const TQString &caption = TQString());
+		KexiDialogBase(KexiMainWindow *parent, const TQString &caption = TQString());
 		virtual ~KexiDialogBase();
 
 		bool isRegistered();
diff --git a/kexi/core/kexidragobjects.cpp b/kexi/core/kexidragobjects.cpp
index f69b5a6ac..e7373ed78 100644
--- a/kexi/core/kexidragobjects.cpp
+++ b/kexi/core/kexidragobjects.cpp
@@ -27,8 +27,8 @@
 /// implementation of KexiFieldDrag
 
 KexiFieldDrag::KexiFieldDrag(const TQString& sourceMimeType, const TQString& sourceName, 
-	const TQString& field, TQWidget *tqparent, const char *name)
- : TQStoredDrag("kexi/field", tqparent, name)
+	const TQString& field, TQWidget *parent, const char *name)
+ : TQStoredDrag("kexi/field", parent, name)
 {
 	TQByteArray data;
 	TQDataStream stream1(data,IO_WriteOnly);
@@ -37,8 +37,8 @@ KexiFieldDrag::KexiFieldDrag(const TQString& sourceMimeType, const TQString& sou
 }
 
 KexiFieldDrag::KexiFieldDrag(const TQString& sourceMimeType, const TQString& sourceName, 
-	const TQStringList& fields, TQWidget *tqparent, const char *name)
- : TQStoredDrag((fields.count() > 1) ? "kexi/fields" : "kexi/field", tqparent, name)
+	const TQStringList& fields, TQWidget *parent, const char *name)
+ : TQStoredDrag((fields.count() > 1) ? "kexi/fields" : "kexi/field", parent, name)
 {
 	TQByteArray data;
 	TQDataStream stream1(data,IO_WriteOnly);
@@ -112,8 +112,8 @@ KexiFieldDrag::decodeMultiple( TQDropEvent* e, TQString& sourceMimeType,
 /// implementation of KexiDataProviderDrag
 
 KexiDataProviderDrag::KexiDataProviderDrag(const TQString& sourceMimeType, const TQString& sourceName,
-	TQWidget *tqparent, const char *name)
- : TQStoredDrag("kexi/dataprovider", tqparent, name)
+	TQWidget *parent, const char *name)
+ : TQStoredDrag("kexi/dataprovider", parent, name)
 {
 	TQByteArray data;
 	TQDataStream stream1(data,IO_WriteOnly);
diff --git a/kexi/core/kexidragobjects.h b/kexi/core/kexidragobjects.h
index 26e2b24f9..4db4534e0 100644
--- a/kexi/core/kexidragobjects.h
+++ b/kexi/core/kexidragobjects.h
@@ -33,12 +33,12 @@ class KEXICORE_EXPORT KexiFieldDrag : public TQStoredDrag
 	public:
 		/*! Creates drag object for a single field \a field. */
 		KexiFieldDrag(const TQString& sourceMimeType, const TQString& sourceName, 
-			const TQString& field, TQWidget *tqparent, const char *name);
+			const TQString& field, TQWidget *parent, const char *name);
 
 		/*! Creates drag object for multiple fields \a fields. 
 		 If there's less than two elements in the list, data is set up as for above ctor. */
 		KexiFieldDrag(const TQString& sourceMimeType, const TQString& sourceName, 
-			const TQStringList& field, TQWidget *tqparent=0, const char *name=0);
+			const TQStringList& field, TQWidget *parent=0, const char *name=0);
 
 		~KexiFieldDrag();
 
@@ -71,7 +71,7 @@ class KEXICORE_EXPORT KexiDataProviderDrag : public TQStoredDrag
 {
 	public:
 		KexiDataProviderDrag(const TQString& sourceMimeType, const TQString& sourceName, 
-		TQWidget *tqparent=0, const char *name=0);
+		TQWidget *parent=0, const char *name=0);
 		~KexiDataProviderDrag() { };
 
 		static bool canDecode( TQDragMoveEvent* e);
diff --git a/kexi/core/kexiguimsghandler.cpp b/kexi/core/kexiguimsghandler.cpp
index 5b8bb8f5f..4121543e4 100644
--- a/kexi/core/kexiguimsghandler.cpp
+++ b/kexi/core/kexiguimsghandler.cpp
@@ -26,8 +26,8 @@
 #include <kmessagebox.h>
 #include <kdialogbase.h>
 
-KexiGUIMessageHandler::KexiGUIMessageHandler(TQWidget *tqparent)
-: KexiDB::MessageHandler(tqparent)
+KexiGUIMessageHandler::KexiGUIMessageHandler(TQWidget *parent)
+: KexiDB::MessageHandler(parent)
 {
 }
 
diff --git a/kexi/core/kexiguimsghandler.h b/kexi/core/kexiguimsghandler.h
index bfe1495e2..af407ab16 100644
--- a/kexi/core/kexiguimsghandler.h
+++ b/kexi/core/kexiguimsghandler.h
@@ -26,7 +26,7 @@
 class KEXICORE_EXPORT KexiGUIMessageHandler : public KexiDB::MessageHandler
 {
 	public:
-		KexiGUIMessageHandler(TQWidget *tqparent = 0);
+		KexiGUIMessageHandler(TQWidget *parent = 0);
 		virtual ~KexiGUIMessageHandler();
 		virtual void showErrorMessage(const TQString &title, const TQString &details = TQString());
 		virtual void showErrorMessage(KexiDB::Object *obj, const TQString& msg = TQString());
diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp
index 7e0386cda..93d73cacc 100644
--- a/kexi/core/kexiinternalpart.cpp
+++ b/kexi/core/kexiinternalpart.cpp
@@ -71,8 +71,8 @@ KexiInternalPartManager internalPartManager;
 
 //----------------------------------------------
 
-KexiInternalPart::KexiInternalPart(TQObject *tqparent, const char *name, const TQStringList &)
- : TQObject(tqparent, name)
+KexiInternalPart::KexiInternalPart(TQObject *parent, const char *name, const TQStringList &)
+ : TQObject(parent, name)
  , m_uniqueDialog(true)
  , m_cancelled(false)
 {
@@ -92,12 +92,12 @@ KexiInternalPart::part(KexiDB::MessageHandler *msgHdr, const char* partName)
 //static
 TQWidget* KexiInternalPart::createWidgetInstance(const char* partName, 
 	const char* widgetClass, KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-	TQWidget *tqparent, const char *objName, TQMap<TQString,TQString>* args)
+	TQWidget *parent, const char *objName, TQMap<TQString,TQString>* args)
 {
 	KexiInternalPart *part = internalPartManager.findPart(msgHdr, partName);
 	if (!part)
 		return 0; //fatal!
-	return part->createWidget(widgetClass, mainWin, tqparent, objName ? objName : partName, args);
+	return part->createWidget(widgetClass, mainWin, parent, objName ? objName : partName, args);
 }
 
 KexiDialogBase* KexiInternalPart::findOrCreateKexiDialog(
@@ -178,21 +178,21 @@ bool KexiInternalPart::executeCommand(const char* partName,
 }
 
 TQWidget* KexiInternalPart::createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
-	TQWidget * tqparent, const char * objName, TQMap<TQString,TQString>* args)
+	TQWidget * parent, const char * objName, TQMap<TQString,TQString>* args)
 {
 	Q_UNUSED(widgetClass);
 	Q_UNUSED(mainWin);
-	Q_UNUSED(tqparent);
+	Q_UNUSED(parent);
 	Q_UNUSED(objName);
 	Q_UNUSED(args);
 	return 0;
 }
 
-KexiViewBase* KexiInternalPart::createView(KexiMainWindow* mainWin, TQWidget * tqparent,
+KexiViewBase* KexiInternalPart::createView(KexiMainWindow* mainWin, TQWidget * parent,
  const char * objName)
 {
 	Q_UNUSED(mainWin);
-	Q_UNUSED(tqparent);
+	Q_UNUSED(parent);
 	Q_UNUSED(objName);
 	return 0;
 }
diff --git a/kexi/core/kexiinternalpart.h b/kexi/core/kexiinternalpart.h
index 4abf1d19a..596f8dd42 100644
--- a/kexi/core/kexiinternalpart.h
+++ b/kexi/core/kexiinternalpart.h
@@ -52,10 +52,10 @@ class KEXICORE_EXPORT KexiInternalPart : public TQObject
   TQ_OBJECT
 
 	public:
-		KexiInternalPart(TQObject *tqparent, const char *name, const TQStringList &);
+		KexiInternalPart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~KexiInternalPart();
 	
-		KexiDialogBase *instance(KexiMainWindow *tqparent);
+		KexiDialogBase *instance(KexiMainWindow *parent);
 
 		/*! Creates a new widget instance using part \a partName.
 		 \a widgetClass is a pseudo class used in case when the part offers more 
@@ -64,23 +64,23 @@ class KEXICORE_EXPORT KexiInternalPart : public TQObject
 		 \a args is two-way optional argument: it can contain custom options used 
 		 on widget's creation. Depending on implementation, the created widget can write its 
 		 state (e.g. result or status information) back to this argument.
-		 Created widget will have assigned \a tqparent widget and \a objName name. */
+		 Created widget will have assigned \a parent widget and \a objName name. */
 		static TQWidget* createWidgetInstance(const char* partName, const char* widgetClass, 
 			KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-			TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
+			TQWidget *parent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
 
 		/*! For convenience. */
 		static TQWidget* createWidgetInstance(const char* partName,
 			KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-			TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0)
-		 { return createWidgetInstance(partName, 0, msgHdr, mainWin, tqparent, objName, args); }
+			TQWidget *parent, const char *objName = 0, TQMap<TQString,TQString>* args = 0)
+		 { return createWidgetInstance(partName, 0, msgHdr, mainWin, parent, objName, args); }
 
 		/*! Creates a new dialog instance. If such instance already exists, 
 		 and is unique (see uniqueDialog()) it is just returned.
 		 The part knows about destroying its dialog instance, (if it is uinque), 
 		 so on another call the dialog will be created again. 
 		 \a msgHdr is a message handler for displaying error messages.
-		 The dialog is assigned to \a mainWin as its tqparent, 
+		 The dialog is assigned to \a mainWin as its parent, 
 		 and \a objName name is set. */
 		static KexiDialogBase* createKexiDialogInstance(const char* partName, 
 			KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, const char *objName = 0);
@@ -96,7 +96,7 @@ class KEXICORE_EXPORT KexiInternalPart : public TQObject
 		 state (e.g. result or status information) back to this argument.
 		 The part knows about destroying its dialog instance, (if it is uinque), 
 		 so on another call the dialog will be created again. 
-		 The dialog is assigned to \a mainWin as its tqparent, 
+		 The dialog is assigned to \a mainWin as its parent, 
 		 and \a objName name is set. */
 		static TQDialog* createModalDialogInstance(const char* partName, 
 			const char* dialogClass, KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
@@ -132,7 +132,7 @@ class KEXICORE_EXPORT KexiInternalPart : public TQObject
 		/*! Reimplement this if your internal part has to return widgets 
 		 or TQDialog objects. */
 		virtual TQWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
-			TQWidget * tqparent, const char * objName = 0, TQMap<TQString,TQString>* args = 0);
+			TQWidget * parent, const char * objName = 0, TQMap<TQString,TQString>* args = 0);
 		
 //		//! Reimplement this if your internal part has to return dialogs
 //		virtual KexiDialogBase *createDialog(KexiMainWindow* /*mainWin*/, 
@@ -140,7 +140,7 @@ class KEXICORE_EXPORT KexiInternalPart : public TQObject
 //		 { return 0; }
 		
 		/*! Reimplement this if your internal part has to return a view object. */
-		virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget * tqparent,
+		virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget * parent,
 			const char *objName = 0);
 
 		/*! Reimplement this if your internal part has to execute a command \a commandName 
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index d95bd0691..ba54fea71 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -87,8 +87,8 @@ public:
 
 using namespace KexiPart;
 
-Part::Part(TQObject *tqparent, const char *name, const TQStringList &)
-: TQObject(tqparent, name)
+Part::Part(TQObject *parent, const char *name, const TQStringList &)
+: TQObject(parent, name)
 , m_guiClient(0)
 , m_registeredPartID(-1) //no registered ID by default
 , d(new PartPrivate())
@@ -100,8 +100,8 @@ Part::Part(TQObject *tqparent, const char *name, const TQStringList &)
 	m_newObjectsAreDirty = false;
 }
 
-Part::Part(TQObject* tqparent, StaticInfo *info)
-: TQObject(tqparent, "StaticPart")
+Part::Part(TQObject* parent, StaticInfo *info)
+: TQObject(parent, "StaticPart")
 , m_guiClient(0)
 , m_registeredPartID(-1) //no registered ID by default
 , d(new PartPrivate())
diff --git a/kexi/core/kexipart.h b/kexi/core/kexipart.h
index 34136d832..f1168fd46 100644
--- a/kexi/core/kexipart.h
+++ b/kexi/core/kexipart.h
@@ -69,7 +69,7 @@ class KEXICORE_EXPORT Part : public TQObject
 
 	public:
 		/*! Constructor. */
-		Part(TQObject *tqparent, const char *name, const TQStringList &);
+		Part(TQObject *parent, const char *name, const TQStringList &);
 		/*! Destructor. */
 		virtual ~Part();
 
@@ -148,9 +148,9 @@ class KEXICORE_EXPORT Part : public TQObject
 		 Default implemention just returns empty KexiDialogTempData object. */
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		/*! Creates a new view for mode \a viewMode, \a item and \a tqparent. The view will be 
+		/*! Creates a new view for mode \a viewMode, \a item and \a parent. The view will be 
 		 used inside \a dialog. */
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0) = 0;
 
 		/*! i18n'd instance name usable for displaying in gui as object's name.
@@ -213,7 +213,7 @@ class KEXICORE_EXPORT Part : public TQObject
 
 	protected:
 		//! Used by StaticPart
-		Part(TQObject* tqparent, StaticInfo *info);
+		Part(TQObject* parent, StaticInfo *info);
 
 //		virtual KexiDialogBase* createInstance(KexiMainWindow *win, const KexiPart::Item &item, int viewMode = Kexi::DataViewMode) = 0;
 
diff --git a/kexi/core/kexipartguiclient.h b/kexi/core/kexipartguiclient.h
index ed88a8161..3b999fee7 100644
--- a/kexi/core/kexipartguiclient.h
+++ b/kexi/core/kexipartguiclient.h
@@ -39,7 +39,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
 	public:
 		virtual ~GUIClient() {};
 
-		inline Part *part() { return static_cast<Part*>(TQObject::tqparent()); }
+		inline Part *part() { return static_cast<Part*>(TQObject::parent()); }
 
 	protected:
 		/*! Creates a new GUI Client. If \a partInstanceClient is true, the part will be 
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index 005754612..f6fcd7d89 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -35,8 +35,8 @@
 
 using namespace KexiPart;
 
-Manager::Manager(TQObject *tqparent)
- : TQObject(tqparent)
+Manager::Manager(TQObject *parent)
+ : TQObject(parent)
 {
 	m_lookupDone = false;
 	m_partlist.setAutoDelete(true);
diff --git a/kexi/core/kexipartmanager.h b/kexi/core/kexipartmanager.h
index e771ae001..c7506e664 100644
--- a/kexi/core/kexipartmanager.h
+++ b/kexi/core/kexipartmanager.h
@@ -74,7 +74,7 @@ class KEXICORE_EXPORT Manager : public TQObject, public KexiDB::Object
 		/**
 		 * creates an empty instance
 		 */
-		Manager(TQObject *tqparent = 0);
+		Manager(TQObject *parent = 0);
 		~Manager();
 
 		/**
diff --git a/kexi/core/kexiproject.h b/kexi/core/kexiproject.h
index e6fb283e4..3a246505c 100644
--- a/kexi/core/kexiproject.h
+++ b/kexi/core/kexiproject.h
@@ -107,7 +107,7 @@ class KEXICORE_EXPORT KexiProject : public TQObject, public KexiDB::Object
 		 value in "kexi__db" table. 
 		 This is often the case for native server-based databases. 
 		 If so, Kexi application can propose importing the database
-		 or linking it to tqparent project (the latter isn't yet implemented).
+		 or linking it to parent project (the latter isn't yet implemented).
 		 For other types of errors the variable is set to true. */
 		tristate open(bool &incompatibleWithKexi);
 
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index aabba3e22..6a696461f 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -230,8 +230,8 @@ KActionPtrList KexiSharedActionHost::sharedActions() const
 	public:
 		KexiAction(const TQString &text, const TQIconSet &pix,
 			const KShortcut &cut, const TQObject *receiver,
-			const char *slot, KActionCollection *tqparent, const char *name)
-		 : KAction(text,pix,cut,receiver,slot,tqparent,name)
+			const char *slot, KActionCollection *parent, const char *name)
+		 : KAction(text,pix,cut,receiver,slot,parent,name)
 		{
 		}
 
diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h
index 235ca9b8e..91cc09f4e 100644
--- a/kexi/core/kexisharedactionhost.h
+++ b/kexi/core/kexisharedactionhost.h
@@ -71,7 +71,7 @@ class KEXICORE_EXPORT KexiSharedActionHost
 
 		/*! \return window widget that is currently focused (using TQWidget::tqfocusWidget())
 		 and matches acceptsSharedActions(). If focused widget does not match,
-		 it's tqparent, grandtqparent, and so on is checked. If all this fails, 
+		 it's parent, grandparent, and so on is checked. If all this fails, 
 		 or no widget has focus, NULL is returned. 
 		 Also works if currently focused window is detached (as in KMDI).
 		 */
diff --git a/kexi/core/kexistaticpart.cpp b/kexi/core/kexistaticpart.cpp
index 86f3a7463..69368a1e9 100644
--- a/kexi/core/kexistaticpart.cpp
+++ b/kexi/core/kexistaticpart.cpp
@@ -51,10 +51,10 @@ StaticPart::~StaticPart()
 {
 }
 
-KexiViewBase* StaticPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+KexiViewBase* StaticPart::createView(TQWidget *parent, KexiDialogBase* dialog, 
 	KexiPart::Item &item, int viewMode)
 {
-	Q_UNUSED(tqparent);
+	Q_UNUSED(parent);
 	Q_UNUSED(dialog);
 	Q_UNUSED(item);
 	Q_UNUSED(viewMode);
diff --git a/kexi/core/kexistaticpart.h b/kexi/core/kexistaticpart.h
index 06ba7501f..314ec59cd 100644
--- a/kexi/core/kexistaticpart.h
+++ b/kexi/core/kexistaticpart.h
@@ -48,14 +48,14 @@ class KEXICORE_EXPORT StaticPart : public Part
 		StaticPart(const TQCString& mimeType, const TQString& itemIcon, const TQString& objectName);
 		virtual ~StaticPart();
 
-		/*! Creates a new view for mode \a viewMode, \a item and \a tqparent. The view will be 
+		/*! Creates a new view for mode \a viewMode, \a item and \a parent. The view will be 
 		 used inside \a dialog. \a args arguments can be passed. */
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>* args) = 0;
 
 	protected:
 		//! unused by static parts
-		KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode);
 };
 
diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp
index a45c5ae9d..b0966463d 100644
--- a/kexi/core/kexiuseraction.cpp
+++ b/kexi/core/kexiuseraction.cpp
@@ -11,8 +11,8 @@
 #include "keximainwindow.h"
 #include "kexiuseraction.h"
 
-KexiUserAction::KexiUserAction(KexiMainWindow *win, KActionCollection *tqparent, const TQString &name, const TQString &text, const TQString &pixmap)
- : KAction(text, pixmap, KShortcut::null(), this, TQT_SLOT(execute()), tqparent, name.latin1())
+KexiUserAction::KexiUserAction(KexiMainWindow *win, KActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap)
+ : KAction(text, pixmap, KShortcut::null(), this, TQT_SLOT(execute()), parent, name.latin1())
 {
 	m_win = win;
 	m_method = 0;
@@ -59,12 +59,12 @@ KexiUserAction::execute()
 }
 
 KexiUserAction *
-KexiUserAction::fromCurrentRecord(KexiMainWindow *context, KActionCollection *tqparent, KexiDB::Cursor *c)
+KexiUserAction::fromCurrentRecord(KexiMainWindow *context, KActionCollection *parent, KexiDB::Cursor *c)
 {
 	if(!c || c->bof() || c->eof())
 		return 0;
 
-	KexiUserAction *a = new KexiUserAction(context, tqparent, c->value(1).toString(), c->value(2).toString(), c->value(3).toString());
+	KexiUserAction *a = new KexiUserAction(context, parent, c->value(1).toString(), c->value(2).toString(), c->value(3).toString());
 	TQString args = c->value(5).toString();
 	bool quote = false;
 
diff --git a/kexi/core/kexiuseraction.h b/kexi/core/kexiuseraction.h
index 71ca18198..b7111bd13 100644
--- a/kexi/core/kexiuseraction.h
+++ b/kexi/core/kexiuseraction.h
@@ -48,7 +48,7 @@ class KEXICORE_EXPORT KexiUserAction : public KAction
 		/*! constructs an action
 		    \note methods are associated using setMethod() 
 		    */
-		KexiUserAction(KexiMainWindow *context, KActionCollection *tqparent, const TQString &name, const TQString &text, const TQString &pixmap);
+		KexiUserAction(KexiMainWindow *context, KActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap);
 		~KexiUserAction();
 
 		/*! sets execution information associated with this action this will mostly look like
@@ -64,7 +64,7 @@ class KEXICORE_EXPORT KexiUserAction : public KAction
 
 		/*! creates a KexiUserAction from current record in \a c
 		    mostly needed for creation from kexi__useractions table */
-		static KexiUserAction *fromCurrentRecord(KexiMainWindow *context, KActionCollection *tqparent, KexiDB::Cursor *c);
+		static KexiUserAction *fromCurrentRecord(KexiMainWindow *context, KActionCollection *parent, KexiDB::Cursor *c);
 
 	protected slots:
 		/*! actually executes the associated method
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index be201c9bf..e89f4a4ea 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -30,8 +30,8 @@
 
 #include <kdebug.h>
 
-KexiViewBase::KexiViewBase(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+KexiViewBase::KexiViewBase(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
  , KexiActionProxy(TQT_TQOBJECT(this), mainWin)
  , m_mainWin(mainWin)
  , m_viewWidget(0)
@@ -218,7 +218,7 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
 //		kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl;
 		if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(o))) {
 			if (e->type()==TQEvent::FocusOut && tqfocusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) {
-				//focus out: when currently focused widget is not a tqparent of this view
+				//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);
diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h
index 60beadf89..139f0b2d0 100644
--- a/kexi/core/kexiviewbase.h
+++ b/kexi/core/kexiviewbase.h
@@ -40,7 +40,7 @@ namespace KexiDB {
  KexiViewBase has 'dirty' flag to indicate that view's data has changed.
  This flag's state is reused by KexiDialogBase object that contain the view.
  KexiViewBase objects can be also nested, using addChildView(): any actions and 'dirty' flag
- are transmited to tqparent view in this case.
+ are transmited to parent view in this case.
 
  KexiViewBase objects are usually allocated within KexiDialogBase objects by implementing
  KexiPart::createView() method. See query or table part code for examples.
@@ -55,13 +55,13 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
   TQ_OBJECT
 
 	public:
-		KexiViewBase(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiViewBase(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		virtual ~KexiViewBase();
 
 		//! \return kexi main window that contain this view
 		inline KexiMainWindow *mainWin() const { return m_mainWin; }
 
-		//! \return tqparent KexiDialogBase that contains this view, or 0 if no dialog contain this view
+		//! \return parent KexiDialogBase that contains this view, or 0 if no dialog contain this view
 		KexiDialogBase* parentDialog() const { return m_dialog; }
 
 		/*! Added for convenience.
@@ -112,9 +112,9 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 		virtual void propertySetSwitched();
 
 		/*! Sets dirty flag on or off. It the flag changes,
-		 dirty(bool) signal is emitted by tqparent dialog (KexiDialog),
-		 to inform the world about that. If this view has a tqparent view, setDirty()
-		 is called also on tqparent view.
+		 dirty(bool) signal is emitted by parent dialog (KexiDialog),
+		 to inform the world about that. If this view has a parent view, setDirty()
+		 is called also on parent view.
 		 Always use this function to update 'dirty' flag information. */
 		void setDirty(bool set);
 
@@ -233,13 +233,13 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 
 		virtual void setFocusInternal() { TQWidget::setFocus(); }
 
-		/*! Allows to react on tqparent dialog's detaching (only for KMDI's ChildFrame mode)
+		/*! Allows to react on parent dialog's detaching (only for KMDI's ChildFrame mode)
 		 - it is called by KexiDialogBase::youAreDetached().
 		 Default implementation does nothing.
 		 Implement it if you want to perform some appropriate actions. */
 		virtual void parentDialogDetached() {};
 
-		/*! Allows to react on tqparent dialog's attaching (only for KMDI's ChildFrame mode)
+		/*! Allows to react on parent dialog's attaching (only for KMDI's ChildFrame mode)
 		 - it is called by KexiDialogBase::youAreAttached().
 		 Default implementation does nothing.
 		 Implement it if you want to perform some appropriate actions. */
diff --git a/kexi/doc/dev/kexi_issues.txt b/kexi/doc/dev/kexi_issues.txt
index f6a27b7ff..62292f2d7 100644
--- a/kexi/doc/dev/kexi_issues.txt
+++ b/kexi/doc/dev/kexi_issues.txt
@@ -17,7 +17,7 @@
 	Easy example: form and report depends on table/query (or more tables and queries).
 
 	This dependency can be called inheriting when we wnat to reuse as many 
-	as possible properties of tqparent 'object' in child 'object'.
+	as possible properties of parent 'object' in child 'object'.
 
 	Examples of these properties: table colors, columns widths, etc. can be 
 	reused in forms/reports that use this its data.
diff --git a/kexi/doc/dev/kexidb_issues.txt b/kexi/doc/dev/kexidb_issues.txt
index 576a64dee..0dd945c69 100644
--- a/kexi/doc/dev/kexidb_issues.txt
+++ b/kexi/doc/dev/kexidb_issues.txt
@@ -191,7 +191,7 @@ kexi__querydata
 	q_sql varchar, //raw sql text - stored in the unchanged form entered by a user (or generated)
 	q_valid boolean, //query schema may be invalid (syntactically or logically, 
 	                //but still can be stored)
-	q_parent_tab integer REFERENCES kexi__objects(o_id) //tqparent table of this query
+	q_parent_tab integer REFERENCES kexi__objects(o_id) //parent table of this query
 
 //This table contains information about fields defined in select queries
 kexi__queryfields
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 9d74be252..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
@@ -82,7 +82,7 @@ Additional toolbars are also available:
 <a name="widgets_tab"></a>
 <H3>5.4.4. Using the &quot;Widgets&quot; tab</H3>
 <p>
-The "Widgets" tab in the Property pane provides a list of form widgets and their hierarchy. Each widget is presented within the hierarchy beside other widgets being on the same level (the same tqparent container). Child widgets (inside containers) are presented using indented names.
+The "Widgets" tab in the Property pane provides a list of form widgets and their hierarchy. Each widget is presented within the hierarchy beside other widgets being on the same level (the same parent container). Child widgets (inside containers) are presented using indented names.
 </p>
 
 <p>
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index c23190691..e7a5ad8ec 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -869,8 +869,8 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form
 	for(TQWidget *w = m_list->first(); w; w = m_list->next())
 		m_pos.insert(w->name(), w->tqgeometry());
 	ObjectTreeItem *item = form->objectTree()->lookup(m_list->first()->name());
-	if(item && item->tqparent()->container())
-		m_containername = item->tqparent()->name();
+	if(item && item->parent()->container())
+		m_containername = item->parent()->name();
 	delete m_list;
 }
 
@@ -948,9 +948,9 @@ CreateLayoutCommand::execute()
 void
 CreateLayoutCommand::unexecute()
 {
-	ObjectTreeItem *tqparent = m_form->objectTree()->lookup(m_containername);
-	if(!tqparent)
-		tqparent = m_form->objectTree();
+	ObjectTreeItem *parent = m_form->objectTree()->lookup(m_containername);
+	if(!parent)
+		parent = m_form->objectTree();
 
 	// We reparent every widget to the Container and take them out of the tqlayout
 	TQMap<TQCString,TQRect>::ConstIterator endIt = m_pos.constEnd();
@@ -959,21 +959,21 @@ CreateLayoutCommand::unexecute()
 		ObjectTreeItem *item = m_form->objectTree()->lookup(it.key());
 		if(item && item->widget())
 		{
-			item->widget()->reparent(tqparent->widget(), TQPoint(0,0), true);
-			item->eventEater()->setContainer(tqparent->container());
+			item->widget()->reparent(parent->widget(), TQPoint(0,0), true);
+			item->eventEater()->setContainer(parent->container());
 			if(m_pos[it.key()].isValid())
 				item->widget()->setGeometry(m_pos[it.key()]);
 			m_form->objectTree()->reparent(item->name(), m_containername);
 		}
 	}
 
-	if(!tqparent->container())
+	if(!parent->container())
 		return;
 	ObjectTreeItem* titem = m_form->objectTree()->lookup(m_name);
 	if (!titem)
 		return; //better this than a crash
 	TQWidget *w = titem->widget();
-	tqparent->container()->deleteWidget(w); // delete the tqlayout widget
+	parent->container()->deleteWidget(w); // delete the tqlayout widget
 	FormManager::self()->windowChanged(m_form->widget()); // to reload ObjectTreeView
 }
 
@@ -1378,7 +1378,7 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 	m_domDoc = TQDomDocument("UI");
 	m_domDoc.appendChild(m_domDoc.createElement("UI"));
 
-	TQDomElement tqparent = m_domDoc.namedItem("UI").toElement();
+	TQDomElement parent = m_domDoc.namedItem("UI").toElement();
 
 	//for(TQWidget *w = list.first(); w; w = list.next())
 	/*for(WidgetListIterator it(list); it.current() != 0; ++it)
@@ -1401,12 +1401,12 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 
 		// We need to store both parentContainer and parentWidget as they may be different (eg for TabWidget page)
 		m_containers.insert(item->name().latin1(), m_form->parentContainer(item->widget())->widget()->name());
-		m_parents.insert(item->name().latin1(), item->tqparent()->name().latin1());
-		FormIO::saveWidget(item, tqparent, m_domDoc);
+		m_parents.insert(item->name().latin1(), item->parent()->name().latin1());
+		FormIO::saveWidget(item, parent, m_domDoc);
 		form->connectionBuffer()->saveAllConnectionsForWidget(item->widget()->name(), m_domDoc);
 	}
 
-	FormIO::cleanClipboard(tqparent);
+	FormIO::cleanClipboard(parent);
 }
 
 void
@@ -1426,7 +1426,7 @@ DeleteWidgetCommand::execute()
 			containerToSelect = cont;
 		cont->deleteWidget(item->widget());
 	}
-	//now we've nothing selecte: select tqparent container
+	//now we've nothing selecte: select parent container
 	if (containerToSelect)
 		m_form->setSelectedWidget( containerToSelect->widget() );
 }
@@ -1456,10 +1456,10 @@ DeleteWidgetCommand::unexecute()
 		if (!titem)
 			return; //better this than a crash
 		Container *cont = titem->container();
-		ObjectTreeItem *tqparent = m_form->objectTree()->lookup(m_parents[wname]);
+		ObjectTreeItem *parent = m_form->objectTree()->lookup(m_parents[wname]);
 		TQDomElement widg = n.toElement();
-		if(tqparent)
-			FormIO::loadWidget(cont, widg, tqparent->widget());
+		if(parent)
+			FormIO::loadWidget(cont, widg, parent->widget());
 		else
 			FormIO::loadWidget(cont, widg);
 	}
diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h
index d998ad360..64e5a2536 100644
--- a/kexi/formeditor/commands.h
+++ b/kexi/formeditor/commands.h
@@ -169,7 +169,7 @@ class KFORMEDITOR_EXPORT LayoutPropertyCommand : public PropertyCommand
 };
 
 /*! This command is used when inserting a widger using toolbar or menu. You only need to give
-the tqparent Container and the widget pos.
+the parent Container and the widget pos.
  The other information is taken from FormManager. */
 class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command
 {
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index fff9a47c5..f683ce744 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -45,8 +45,8 @@ namespace KFormDesigner {
 /////////////////////////////////////////////////////////////////////////////////
 ///////////// The dialog to edit or add/remove connections //////////////////////
 /////////////////////////////////////////////////////////////////////////////////
-ConnectionDialog::ConnectionDialog(TQWidget *tqparent)
-: KDialogBase(tqparent, "connections_dialog", true, i18n("Edit Form Connections"),
+ConnectionDialog::ConnectionDialog(TQWidget *parent)
+: KDialogBase(parent, "connections_dialog", true, i18n("Edit Form Connections"),
 							Ok|Cancel|Details, Ok, false)
 , m_buffer(0)
 {
diff --git a/kexi/formeditor/connectiondialog.h b/kexi/formeditor/connectiondialog.h
index 4f1a9a288..d2ecb0973 100644
--- a/kexi/formeditor/connectiondialog.h
+++ b/kexi/formeditor/connectiondialog.h
@@ -49,7 +49,7 @@ class KFORMEDITOR_EXPORT ConnectionDialog : public KDialogBase
   TQ_OBJECT
 
 	public:
-		ConnectionDialog(TQWidget *tqparent);
+		ConnectionDialog(TQWidget *parent);
 		~ConnectionDialog() {;}
 
 		/*! Displays as modal dialog, to edit connections in Form::connectionBuffer(). */
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index 2b6d5eb72..d1275adc2 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -88,8 +88,8 @@ EventEater::~EventEater()
 
 // Container itself
 
-Container::Container(Container *toplevel, TQWidget *container, TQObject *tqparent, const char *name)
-: TQObject(tqparent, name)
+Container::Container(Container *toplevel, TQWidget *container, TQObject *parent, const char *name)
+: TQObject(parent, name)
 , m_insertBegin(-1,-1)
 , m_mousePressEventReceived(false)
 , m_mouseReleaseEvent(TQEvent::None, TQPoint(), 0, 0)
@@ -118,11 +118,11 @@ Container::Container(Container *toplevel, TQWidget *container, TQObject *tqparen
 			widget()->name(), widget(), this, this);
 		setObjectTree(it);
 
-		if(tqparent->isWidgetType())
+		if(parent->isWidgetType())
 		{
-			TQString n = tqparent->name();
-			ObjectTreeItem *tqparent = m_form->objectTree()->lookup(n);
-			m_form->objectTree()->addItem(tqparent, it);
+			TQString n = parent->name();
+			ObjectTreeItem *parent = m_form->objectTree()->lookup(n);
+			m_form->objectTree()->addItem(parent, it);
 		}
 		else
 			m_form->objectTree()->addItem(toplevel->objectTree(), it);
@@ -406,9 +406,9 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 			}
 			else if((kev->key() == Key_Tab) || (kev->key() == Key_BackTab)){
 				ObjectTreeItem *item = form()->objectTree()->lookup(form()->selectedWidgets()->first()->name());
-				if(!item || !item->tqparent())
+				if(!item || !item->parent())
 					return true;
-				ObjectTreeList *list = item->tqparent()->tqchildren();
+				ObjectTreeList *list = item->parent()->tqchildren();
 				if(list->count() == 1)
 					return true;
 				int index = list->findRef(item);
@@ -1107,7 +1107,7 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
 
 	for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next())
 	{
-		if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(!w || !w->parent() || w->parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->parent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 			continue;
 
 		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
@@ -1133,7 +1133,7 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
 	for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next())
 	{
 		// Don't move tab widget pages (or widget stack pages)
-		if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(!w || !w->parent() || w->parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->parent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 			continue;
 
 		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
diff --git a/kexi/formeditor/container.h b/kexi/formeditor/container.h
index f2ae1f145..36f35e822 100644
--- a/kexi/formeditor/container.h
+++ b/kexi/formeditor/container.h
@@ -51,7 +51,7 @@ class KFORMEDITOR_EXPORT EventEater : public TQObject
 
 	public:
 		/*! Constructs eater object. All events for \a widget and it's subwidgets
-		will be redirected to \a container. \a container will be also tqparent of eater object,
+		will be redirected to \a container. \a container will be also parent of eater object,
 		so you don't need to care about deleting it. */
 		EventEater(TQWidget *widget, TQObject *container);
 		~EventEater();
@@ -80,8 +80,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 
 		/**
 		 * Creates a Container from the widget \a container, which have
-		 \a toplevel as tqparent Container. */
-		Container(Container *toplevel, TQWidget *container, TQObject *tqparent=0, const char *name=0);
+		 \a toplevel as parent Container. */
+		Container(Container *toplevel, TQWidget *container, TQObject *parent=0, const char *name=0);
 		virtual ~Container();
 
 		//! \return a pointer to the toplevel Container, or 0 if this Container is toplevel
@@ -147,7 +147,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		  (and so of the Form). If \a add is true, the formerly selected widget
 		  is still selected, and the new one is just added. If false, \a selected
 		   replace the actually selected widget. If \a dontRaise is true, then
-		  the widget \a selected (and its tqparent) won't be raised (eg when you
+		  the widget \a selected (and its parent) won't be raised (eg when you
 		   select widget in ObjectTreeView).
 		  \sa Form::setSelectedWidget() */
 		void setSelectedWidget(TQWidget *selected, bool add, bool dontRaise=false,
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index 020a78762..27878e7fe 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -38,9 +38,9 @@ namespace KFormDesigner {
 /// A Dialog to edit the contents of a listview /////////////////////
 /////////////////////////////////////////////////////////////////////////////////
 
-EditListViewDialog::EditListViewDialog(TQWidget *tqparent)
-//js(kde3.2 dependent) : KDialogBase(Tabbed, 0/* WFlags */, tqparent, "editlistview_dialog", true, i18n("Edit listview contents"), Ok|Cancel, Ok, false)
-: KDialogBase(Tabbed, i18n("Edit Listview Contents"), Ok|Cancel, Ok, tqparent, "editlistview_dialog", true /* modal */, false)
+EditListViewDialog::EditListViewDialog(TQWidget *parent)
+//js(kde3.2 dependent) : KDialogBase(Tabbed, 0/* WFlags */, parent, "editlistview_dialog", true, i18n("Edit listview contents"), Ok|Cancel, Ok, false)
+: KDialogBase(Tabbed, i18n("Edit Listview Contents"), Ok|Cancel, Ok, parent, "editlistview_dialog", true /* modal */, false)
 {
 	m_column = addPage(i18n("Columns"));
 	m_contents = addPage(i18n("Contents"));
@@ -356,33 +356,33 @@ EditListViewDialog::updateButtons(TQListViewItem *item)
 
 	m_buttons[BNewChild]->setEnabled(true);
 	m_buttons[BRemRow]->setEnabled(true);
-	m_buttons[BRowUp]->setEnabled( (item->itemAbove() && (item->itemAbove()->tqparent() == item->tqparent())) );
+	m_buttons[BRowUp]->setEnabled( (item->itemAbove() && (item->itemAbove()->parent() == item->parent())) );
 	m_buttons[BRowDown]->setEnabled(item->nextSibling());
 }
 
 void
-EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *tqparent)
+EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *parent)
 {
 	TQListViewItem *newItem;
 	if(listview->inherits("KListView"))
 	{
-		if(tqparent)
-			newItem = new KListViewItem(tqparent);
+		if(parent)
+			newItem = new KListViewItem(parent);
 		else
 			newItem = new KListViewItem(listview);
 	}
 	else
 	{
-		if(tqparent)
-			newItem = new TQListViewItem(tqparent);
+		if(parent)
+			newItem = new TQListViewItem(parent);
 		else
 			newItem = new TQListViewItem(listview);
 	}
 
 	// We need to move the item at the end, which is the expected behaviour (by default it is inserted at the beginning)
 	TQListViewItem *last;
-	if(tqparent)
-		last = tqparent->firstChild();
+	if(parent)
+		last = parent->firstChild();
 	else
 		last = listview->firstChild();
 
@@ -406,12 +406,12 @@ EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, T
 void
 EditListViewDialog::newRow()
 {
-	KListViewItem *tqparent = (KListViewItem*)m_listview->selectedItem();
-	if(tqparent)
-		tqparent = (KListViewItem*)tqparent->tqparent();
+	KListViewItem *parent = (KListViewItem*)m_listview->selectedItem();
+	if(parent)
+		parent = (KListViewItem*)parent->parent();
 	KListViewItem *item;
-	if(tqparent)
-		item = new KListViewItem(tqparent, m_listview->selectedItem());
+	if(parent)
+		item = new KListViewItem(parent, m_listview->selectedItem());
 	else
 		item = new KListViewItem(m_listview, m_listview->selectedItem());
 	item->setText(0, i18n("New Item"));
@@ -421,16 +421,16 @@ EditListViewDialog::newRow()
 void
 EditListViewDialog::newChildRow()
 {
-	KListViewItem *tqparent = (KListViewItem*)m_listview->currentItem();
+	KListViewItem *parent = (KListViewItem*)m_listview->currentItem();
 	KListViewItem *item;
-	if(tqparent)
-		item = new KListViewItem(tqparent);
+	if(parent)
+		item = new KListViewItem(parent);
 	else
 		item = new KListViewItem(m_listview, m_listview->currentItem());
 	item->setText(0, i18n("Sub Item"));
 
 	m_listview->setCurrentItem(item);
-	tqparent->setOpen(true);
+	parent->setOpen(true);
 }
 
 void
diff --git a/kexi/formeditor/editlistviewdialog.h b/kexi/formeditor/editlistviewdialog.h
index be2ae1061..b6386a97c 100644
--- a/kexi/formeditor/editlistviewdialog.h
+++ b/kexi/formeditor/editlistviewdialog.h
@@ -52,7 +52,7 @@ class KFORMEDITOR_EXPORT EditListViewDialog : public KDialogBase
   TQ_OBJECT
 
 	public:
-		EditListViewDialog(TQWidget *tqparent);
+		EditListViewDialog(TQWidget *parent);
 		~EditListViewDialog() {}
 
 		int exec(TQListView *listview);
@@ -75,9 +75,9 @@ class KFORMEDITOR_EXPORT EditListViewDialog : public KDialogBase
 		void MoveRowDown();
 
 	protected:
-		/*! Loads all child items of \a item into \a listview (may be different from the \a items 's listview) as child of \a tqparent item.
+		/*! Loads all child items of \a item into \a listview (may be different from the \a items 's listview) as child of \a parent item.
 		This is used to copy the contents of a listview into another listview. */
-		void loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *tqparent);
+		void loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *parent);
 
 	protected:
 		enum { BNewRow = 10, BNewChild, BRemRow, BRowUp, BRowDown , BColAdd = 20, BColRem, BColUp, BColDown };
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index ff7a2562a..2a38803a3 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -64,8 +64,8 @@
 # include <kinputdialog.h>
 #endif
 
-ContainerWidget::ContainerWidget(TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+ContainerWidget::ContainerWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
 {
 }
 
@@ -92,8 +92,8 @@ void ContainerWidget::dropEvent( TQDropEvent *e )
 
 ////////////////////////
 
-GroupBox::GroupBox(const TQString & title, TQWidget *tqparent, const char *name)
- : TQGroupBox(title, tqparent, name)
+GroupBox::GroupBox(const TQString & title, TQWidget *parent, const char *name)
+ : TQGroupBox(title, parent, name)
 {
 }
 
@@ -115,8 +115,8 @@ void GroupBox::dropEvent( TQDropEvent *e )
 
 ////////////////////////
 
-KFDTabWidget::KFDTabWidget(TQWidget *tqparent, const char *name)
- : KFormDesigner::TabWidget(tqparent, name)
+KFDTabWidget::KFDTabWidget(TQWidget *parent, const char *name)
+ : KFormDesigner::TabWidget(parent, name)
 {
 }
 
@@ -152,8 +152,8 @@ void KFDTabWidget::dropEvent( TQDropEvent *e )
 
 /// Various tqlayout widgets /////////////////:
 
-HBox::HBox(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+HBox::HBox(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -165,8 +165,8 @@ HBox::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-VBox::VBox(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+VBox::VBox(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -178,8 +178,8 @@ VBox::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-Grid::Grid(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+Grid::Grid(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -191,8 +191,8 @@ Grid::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-HFlow::HFlow(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+HFlow::HFlow(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -204,8 +204,8 @@ HFlow::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-VFlow::VFlow(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+VFlow::VFlow(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -228,12 +228,12 @@ VFlow::tqsizeHint() const
 
 ///////  Tab related KCommand (to allow tab creation/deletion undoing)
 
-InsertPageCommand::InsertPageCommand(KFormDesigner::Container *container, TQWidget *tqparent)
+InsertPageCommand::InsertPageCommand(KFormDesigner::Container *container, TQWidget *parent)
   : KCommand()
 {
 	m_containername = container->widget()->name();
 	m_form = container->form();
-	m_parentname = tqparent->name();
+	m_parentname = parent->name();
 	m_pageid = -1;
 }
 
@@ -241,21 +241,21 @@ void
 InsertPageCommand::execute()
 {
 	KFormDesigner::Container *container = m_form->objectTree()->lookup(m_containername)->container();
-	TQWidget *tqparent = m_form->objectTree()->lookup(m_parentname)->widget();
+	TQWidget *parent = m_form->objectTree()->lookup(m_parentname)->widget();
 	if(m_name.isEmpty()) {
 		m_name = container->form()->objectTree()->generateUniqueName(
 			container->form()->library()->displayName(TQWIDGET_OBJECT_NAME_STRING).latin1(),
 			/*!numberSuffixRequired*/false);
 	}
 
-	TQWidget *page = container->form()->library()->createWidget(TQWIDGET_OBJECT_NAME_STRING, tqparent, m_name.latin1(), container);
-//	TQWidget *page = new ContainerWidget(tqparent, m_name.latin1());
-//	new KFormDesigner::Container(container, page, tqparent);
+	TQWidget *page = container->form()->library()->createWidget(TQWIDGET_OBJECT_NAME_STRING, parent, m_name.latin1(), container);
+//	TQWidget *page = new ContainerWidget(parent, m_name.latin1());
+//	new KFormDesigner::Container(container, page, parent);
 
-	TQCString classname = tqparent->className();
+	TQCString classname = parent->className();
 	if(classname == "KFDTabWidget")
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(tqparent);
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
 		TQString n = i18n("Page %1").tqarg(tab->count() + 1);
 		tab->addTab(page, n);
 		tab->showPage(page);
@@ -265,7 +265,7 @@ InsertPageCommand::execute()
 	}
 	else if(classname == TQWIDGETSTACK_OBJECT_NAME_STRING)
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)tqparent;
+		TQWidgetStack *stack = (TQWidgetStack*)parent;
 		stack->addWidget(page, m_pageid);
 		stack->raiseWidget(page);
 		m_pageid = stack->id(page);
@@ -279,21 +279,21 @@ void
 InsertPageCommand::unexecute()
 {
 	TQWidget *page = m_form->objectTree()->lookup(m_name)->widget();
-	TQWidget *tqparent = m_form->objectTree()->lookup(m_parentname)->widget();
+	TQWidget *parent = m_form->objectTree()->lookup(m_parentname)->widget();
 
 	KFormDesigner::WidgetList list;
 	list.append(page);
 	KCommand *com = new KFormDesigner::DeleteWidgetCommand(list, m_form);
 
-	TQCString classname = tqparent->className();
+	TQCString classname = parent->className();
 	if(classname == "KFDTabWidget")
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(tqparent);
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
 		tab->removePage(page);
 	}
 	else if(classname == TQWIDGETSTACK_OBJECT_NAME_STRING)
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)tqparent;
+		TQWidgetStack *stack = (TQWidgetStack*)parent;
 		int id = stack->id(page) - 1;
 		while(!stack->widget(id))
 			id--;
@@ -314,8 +314,8 @@ InsertPageCommand::name() const
 
 /////// Sub forms ////////////////////////:
 
-SubForm::SubForm(TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_form(0), m_widget(0)
+SubForm::SubForm(TQWidget *parent, const char *name)
+: TQScrollView(parent, name), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
@@ -352,8 +352,8 @@ SubForm::setFormName(const TQString &name)
 
 /////   The factory /////////////////////////
 
-ContainerFactory::ContainerFactory(TQObject *tqparent, const char *, const TQStringList &)
- : KFormDesigner::WidgetFactory(tqparent, "containers")
+ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStringList &)
+ : KFormDesigner::WidgetFactory(parent, "containers")
 {
 	KFormDesigner::WidgetInfo *wBtnGroup = new KFormDesigner::WidgetInfo(this);
 	wBtnGroup->setPixmap("frame");
@@ -674,10 +674,10 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); //m_widget;
 		setWidget(
 			w->parentWidget(),
-			container->form()->objectTree()->lookup(stack->name())->tqparent()->container()
+			container->form()->objectTree()->lookup(stack->name())->parent()->container()
 		);
-//		m_container = container->form()->objectTree()->lookup(m_widget->name())->tqparent()->container();
-//		m_container = container->form()->objectTree()->lookup(stack->name())->tqparent()->container();
+//		m_container = container->form()->objectTree()->lookup(m_widget->name())->parent()->container();
+//		m_container = container->form()->objectTree()->lookup(stack->name())->parent()->container();
 
 		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addStackPage()) );
 
@@ -720,17 +720,17 @@ ContainerFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 }
 
 bool
-ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
+ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent)
 {
 	if((name == "title") && (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
 		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget()->parentWidget());
-		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "title", tab->tabLabel(w));
+		KFormDesigner::FormIO::savePropertyElement(parentNode, parent, "attribute", "title", tab->tabLabel(w));
 	}
 	else if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 	{
 		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
-		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "id", stack->id(w));
+		KFormDesigner::FormIO::savePropertyElement(parentNode, parent, "attribute", "id", stack->id(w));
 	}
 	else
 		return false;
@@ -741,7 +741,7 @@ bool
 ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item)
 {
 	TQString name = node.attribute("name");
-	if((name == "title") && (item->tqparent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+	if((name == "title") && (item->parent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
 		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget());
 		tab->addTab(w, node.firstChild().toElement().text());
diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index c8bdc1a63..b88b437f8 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -58,7 +58,7 @@ class KFORMEDITOR_EXPORT HBox : public TQFrame
   TQ_OBJECT
 
 	public:
-		HBox(TQWidget *tqparent, const char *name);
+		HBox(TQWidget *parent, const char *name);
 		virtual ~HBox(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -74,7 +74,7 @@ class KFORMEDITOR_EXPORT VBox : public TQFrame
   TQ_OBJECT
 
 	public:
-		VBox(TQWidget *tqparent, const char *name);
+		VBox(TQWidget *parent, const char *name);
 		virtual ~VBox(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -90,7 +90,7 @@ class KFORMEDITOR_EXPORT Grid : public TQFrame
   TQ_OBJECT
 
 	public:
-		Grid(TQWidget *tqparent, const char *name);
+		Grid(TQWidget *parent, const char *name);
 		virtual ~Grid(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -106,7 +106,7 @@ class KFORMEDITOR_EXPORT HFlow : public TQFrame
   TQ_OBJECT
 
 	public:
-		HFlow(TQWidget *tqparent, const char *name);
+		HFlow(TQWidget *parent, const char *name);
 		virtual ~HFlow(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -122,7 +122,7 @@ class KFORMEDITOR_EXPORT VFlow : public TQFrame
   TQ_OBJECT
 
 	public:
-		VFlow(TQWidget *tqparent, const char *name);
+		VFlow(TQWidget *parent, const char *name);
 		virtual ~VFlow(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -141,7 +141,7 @@ class KFORMEDITOR_EXPORT ContainerWidget : public TQWidget
 	friend class KFDTabWidget;
 
 	public:
-		ContainerWidget(TQWidget *tqparent, const char *name);
+		ContainerWidget(TQWidget *parent, const char *name);
 		virtual ~ContainerWidget();
 
 		virtual TQSize tqsizeHint() const;
@@ -167,7 +167,7 @@ class KFORMEDITOR_EXPORT KFDTabWidget : public KFormDesigner::TabWidget
   TQ_OBJECT
 
 	public:
-		KFDTabWidget(TQWidget *tqparent, const char *name);
+		KFDTabWidget(TQWidget *parent, const char *name);
 		virtual ~KFDTabWidget();
 
 		virtual TQSize tqsizeHint() const;
@@ -193,7 +193,7 @@ class KFORMEDITOR_EXPORT GroupBox : public TQGroupBox
   TQ_OBJECT
 
 	public:
-		GroupBox(const TQString & title, TQWidget *tqparent, const char *name);
+		GroupBox(const TQString & title, TQWidget *parent, const char *name);
 		virtual ~GroupBox();
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
@@ -218,7 +218,7 @@ class KFORMEDITOR_EXPORT SubForm : public TQScrollView
 	TQ_PROPERTY(TQString formName READ formName WRITE setFormName DESIGNABLE true)
 
 	public:
-		SubForm(TQWidget *tqparent, const char *name);
+		SubForm(TQWidget *parent, const char *name);
 		~SubForm() {}
 
 		//! \return the name of the subform inside the db
@@ -239,10 +239,10 @@ class ContainerFactory : public KFormDesigner::WidgetFactory
   TQ_OBJECT
 
 	public:
-		ContainerFactory(TQObject *tqparent, const char *name, const TQStringList &args);
+		ContainerFactory(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~ContainerFactory();
 
-		virtual TQWidget *createWidget(const TQCString & classname, TQWidget *tqparent, const char *name, KFormDesigner::Container *container,
+		virtual TQWidget *createWidget(const TQCString & classname, TQWidget *parent, const char *name, KFormDesigner::Container *container,
 			int options = DefaultOptions);
 		virtual bool createMenuActions(const TQCString& classname, TQWidget *w, TQPopupMenu *menu,
 			KFormDesigner::Container *container);
@@ -251,7 +251,7 @@ class ContainerFactory : public KFormDesigner::WidgetFactory
 		virtual bool previewWidget(const TQCString &classname, TQWidget *widget,
 			KFormDesigner::Container *container);
 		virtual bool saveSpecialProperty(const TQCString &classname, const TQString &name,
-			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent);
 		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			KFormDesigner::ObjectTreeItem *item);
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 32c557b39..bfc9db639 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -57,8 +57,8 @@
 #include "stdwidgetfactory.h"
 
 // Some widgets subclass to allow event filtering and some other things
-KexiPictureLabel::KexiPictureLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name)
- : TQLabel(tqparent, name)
+KexiPictureLabel::KexiPictureLabel(const TQPixmap &pix, TQWidget *parent, const char *name)
+ : TQLabel(parent, name)
 {
 	setPixmap(pix);
 	setScaledContents(false);
@@ -72,8 +72,8 @@ KexiPictureLabel::setProperty(const char *name, const TQVariant &value)
 	return TQLabel::setProperty(name, value);
 }
 
-Line::Line(Qt::Orientation orient, TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name)
+Line::Line(Qt::Orientation orient, TQWidget *parent, const char *name)
+ : TQFrame(parent, name)
 {
 	setFrameShadow(Sunken);
 	if(orient ==Qt::Horizontal)
@@ -102,8 +102,8 @@ Line::orientation() const
 
 // The factory itself
 
-StdWidgetFactory::StdWidgetFactory(TQObject *tqparent, const char *, const TQStringList &)
- : KFormDesigner::WidgetFactory(tqparent, "stdwidgets")
+StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStringList &)
+ : KFormDesigner::WidgetFactory(parent, "stdwidgets")
 {
 	KFormDesigner::WidgetInfo *wFormWidget = new KFormDesigner::WidgetInfo(this);
 	wFormWidget->setPixmap("form");
@@ -798,18 +798,18 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement &
 }
 
 void
-StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *tqparent, KListView *listview)
+StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview)
 {
 	TQListViewItem *item;
-	if(tqparent)
-		item = new KListViewItem(tqparent);
+	if(parent)
+		item = new KListViewItem(parent);
 	else
 		item = new KListViewItem(listview);
 
 	// We need to move the item at the end of the list
 	TQListViewItem *last;
-	if(tqparent)
-		last = tqparent->firstChild();
+	if(parent)
+		last = parent->firstChild();
 	else
 		last = listview->firstChild();
 
diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h
index 5d9032f0f..e91f08b9f 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.h
+++ b/kexi/formeditor/factories/stdwidgetfactory.h
@@ -31,7 +31,7 @@ class KFORMEDITOR_EXPORT KexiPictureLabel : public TQLabel
   TQ_OBJECT
 
 	public:
-		KexiPictureLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name);
+		KexiPictureLabel(const TQPixmap &pix, TQWidget *parent, const char *name);
 		~KexiPictureLabel(){;}
 
 		virtual bool setProperty(const char *name, const TQVariant &value);
@@ -44,7 +44,7 @@ class KFORMEDITOR_EXPORT Line : public TQFrame
 	TQ_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
 
 	public:
-		Line(Qt::Orientation orient, TQWidget *tqparent, const char *name);
+		Line(Qt::Orientation orient, TQWidget *parent, const char *name);
 		~Line(){;}
 
 		void setOrientation(Qt::Orientation orient);
@@ -58,7 +58,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
   TQ_OBJECT
 
 	public:
-		StdWidgetFactory(TQObject *tqparent, const char *name, const TQStringList &args);
+		StdWidgetFactory(TQObject *parent, const char *name, const TQStringList &args);
 		~StdWidgetFactory();
 
 		virtual TQWidget *createWidget(const TQCString &c, TQWidget *p, const char *n, 
@@ -74,7 +74,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 
 		virtual bool saveSpecialProperty(const TQCString &classname,
 			const TQString &name, const TQVariant &value, TQWidget *w,
-			TQDomElement &parentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &parent);
 		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node,
 			TQWidget *w, KFormDesigner::ObjectTreeItem *item);
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
@@ -92,7 +92,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 		virtual bool changeText(const TQString &newText);
 		virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname);
 		void saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc);
-		void readListItem(TQDomElement &node, TQListViewItem *tqparent, KListView *listview);
+		void readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview);
 
 	private:
 //		KFormDesigner::Container *m_container;
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index e8b25c844..b5b209365 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -164,7 +164,7 @@ Form::activeContainer()
 	if(it->container())
 		return it->container();
 	else
-		return it->tqparent()->container();
+		return it->parent()->container();
 }
 
 ObjectTreeItem*
@@ -202,10 +202,10 @@ Form::parentContainer(TQWidget *w)
 	//else
 	it = d->topTree->lookup(w->name());
 
-	if(it->tqparent()->container())
-		return it->tqparent()->container();
+	if(it->parent()->container())
+		return it->parent()->container();
 	else
-		return it->tqparent()->tqparent()->container();
+		return it->parent()->parent()->container();
 }
 
 
@@ -267,7 +267,7 @@ Form::setSelectedWidget(TQWidget *w, bool add, bool dontRaise, bool moreWillBeSe
 	emit selectionChanged(w, add, moreWillBeSelected);
 	emitActionSignals(false);
 
-	// WidgetStack and TabWidget pages widgets shouldn't have resize handles, but their tqparent
+	// WidgetStack and TabWidget pages widgets shouldn't have resize handles, but their parent
 	if(!FormManager::self()->isTopLevel(w) && w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 	{
 		w = w->parentWidget();
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index d41d7a293..7df731c6c 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -169,21 +169,21 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 		//! \return the form's toplevel widget, or 0 if designMode() == false.
 		TQWidget* widget() const;
 
-//		//! \return the FormManager tqparent of this form.
+//		//! \return the FormManager parent of this form.
 //		FormManager* manager() const { return d->manager; }
 
-		/*! \return A pointer to the currently active Container, ie the tqparent Container for a simple widget,
+		/*! \return A pointer to the currently active Container, ie the parent Container for a simple widget,
 		    and the widget's Container if it is itself a container.
 		 */
 		Container* activeContainer();
 
-		/*! \return A pointer to the tqparent Container of the currently selected widget.
+		/*! \return A pointer to the parent Container of the currently selected widget.
 		 It is the same as activeContainer() for a simple widget, but unlike this function
-		  it will also return the tqparent Container if the widget itself is a Container.
+		  it will also return the parent Container if the widget itself is a Container.
 		 */
 		Container* parentContainer(TQWidget *w=0);
 
-		/*! \return The \ref Container which is a tqparent of all widgets in \a wlist.
+		/*! \return The \ref Container which is a parent of all widgets in \a wlist.
 		 Used by \ref activeContainer(), and to find where
 		 to paste widgets when multiple widgets are selected. */
 		ObjectTreeItem* commonParentContainer(WidgetList *wlist);
@@ -289,7 +289,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 		 (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,
-		 child widgets should ordered by tqparent tab's order. */
+		 child widgets should ordered by parent tab's order. */
 		void autoAssignTabStops();
 
 #ifdef KEXI_DEBUG_GUI
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 639b4a831..563d89fd2 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -52,8 +52,8 @@
 #include "formIO.h"
 
 /// A blank widget used when the class name is not supported
-CustomWidget::CustomWidget(const TQCString &className, TQWidget *tqparent, const char *name)
-: TQWidget(tqparent, name), m_className(className)
+CustomWidget::CustomWidget(const TQCString &className, TQWidget *parent, const char *name)
+: TQWidget(parent, name), m_className(className)
 {
 	setBackgroundMode(TQt::PaletteDark);
 }
@@ -398,7 +398,7 @@ FormIO::loadFormFromDom(Form *form, TQWidget *container, TQDomDocument &inBuf)
 /////////////////////////////////////////////////////////////////////////////
 
 void
-FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, const char *name, 
+FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const char *name, 
 	const TQVariant &value, TQWidget *w, WidgetLibrary *lib)
 {
 	// Widget specific properties and attributes ///////////////
@@ -416,14 +416,14 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, con
 	{
 		kdDebug() << "FormIO::savePropertyValue()  The object doesn't have this property. Let's try the WidgetLibrary." << endl;
 		if(lib)
-			lib->saveSpecialProperty(w->className(), name, value, w, parentNode, tqparent);
+			lib->saveSpecialProperty(w->className(), name, value, w, parentNode, parent);
 		return;
 	}
 
 	const TQMetaProperty *meta = subwidget->tqmetaObject()->property(propertyId, true);
 	if (!meta->stored( subwidget )) //not storable
 		return;
-	TQDomElement propertyE = tqparent.createElement("property");
+	TQDomElement propertyE = parent.createElement("property");
 	propertyE.setAttribute("name", name);
 	if (addSubwidgetFlag)
 		propertyE.setAttribute("subwidget", "true");
@@ -437,15 +437,15 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, con
 		if(meta->isSetType())
 		{
 			TQStringList list = TQStringList::fromStrList(meta->valueToKeys(value.toInt()));
-			type = tqparent.createElement("set");
-			valueE = tqparent.createTextNode(list.join("|"));
+			type = parent.createElement("set");
+			valueE = parent.createTextNode(list.join("|"));
 			type.appendChild(valueE);
 		}
 		else
 		{
 			TQString s = meta->valueToKey(value.toInt());
-			type = tqparent.createElement("enum");
-			valueE = tqparent.createTextNode(s);
+			type = parent.createElement("enum");
+			valueE = parent.createTextNode(s);
 			type.appendChild(valueE);
 		}
 		propertyE.appendChild(type);
@@ -455,13 +455,13 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, con
 
 	if(value.type() == TQVariant::Pixmap) {
 		TQDomText valueE;
-		TQDomElement type = tqparent.createElement("pixmap");
+		TQDomElement type = parent.createElement("pixmap");
 		TQCString property = propertyE.attribute("name").latin1();
 //todo		TQCString pixmapName = m_currentItem->widget()->property("pixmapName").toCString();
 		if(m_savePixmapsInline /* (js)too risky: || m_currentItem->pixmapName(property).isNull() */)
-			valueE = tqparent.createTextNode(saveImage(tqparent, value.toPixmap()));
+			valueE = parent.createTextNode(saveImage(parent, value.toPixmap()));
 		else
-			valueE = tqparent.createTextNode(m_currentItem->pixmapName(property));
+			valueE = parent.createTextNode(m_currentItem->pixmapName(property));
 		type.appendChild(valueE);
 		propertyE.appendChild(type);
 		parentNode.appendChild(propertyE);
@@ -469,12 +469,12 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, con
 	}
 
 	// Saving a "normal" property
-	writeVariant(tqparent, propertyE, value);
+	writeVariant(parent, propertyE, value);
 	parentNode.appendChild(propertyE);
 }
 
 void
-FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVariant value)
+FormIO::writeVariant(TQDomDocument &parent, TQDomElement &parentNode, TQVariant value)
 {
 	TQDomElement type;
 	TQDomText valueE;
@@ -483,29 +483,29 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 	{
 		case TQVariant::String:
 		{
-			type = tqparent.createElement("string");
-			valueE = tqparent.createTextNode(value.toString());
+			type = parent.createElement("string");
+			valueE = parent.createTextNode(value.toString());
 			type.appendChild(valueE);
 			break;
 		}
 		case TQVariant::CString:
 		{
-			type = tqparent.createElement("cstring");
-			valueE = tqparent.createTextNode(value.toString());
+			type = parent.createElement("cstring");
+			valueE = parent.createTextNode(value.toString());
 			type.appendChild(valueE);
 			break;
 		}
 		case TQVariant::Rect:
 		{
-			type = tqparent.createElement("rect");
-			TQDomElement x = tqparent.createElement("x");
-			TQDomElement y = tqparent.createElement("y");
-			TQDomElement w = tqparent.createElement("width");
-			TQDomElement h = tqparent.createElement("height");
-			TQDomText valueX = tqparent.createTextNode(TQString::number(value.toRect().x()));
-			TQDomText valueY = tqparent.createTextNode(TQString::number(value.toRect().y()));
-			TQDomText valueW = tqparent.createTextNode(TQString::number(value.toRect().width()));
-			TQDomText valueH = tqparent.createTextNode(TQString::number(value.toRect().height()));
+			type = parent.createElement("rect");
+			TQDomElement x = parent.createElement("x");
+			TQDomElement y = parent.createElement("y");
+			TQDomElement w = parent.createElement("width");
+			TQDomElement h = parent.createElement("height");
+			TQDomText valueX = parent.createTextNode(TQString::number(value.toRect().x()));
+			TQDomText valueY = parent.createTextNode(TQString::number(value.toRect().y()));
+			TQDomText valueW = parent.createTextNode(TQString::number(value.toRect().width()));
+			TQDomText valueH = parent.createTextNode(TQString::number(value.toRect().height()));
 
 			x.appendChild(valueX);
 			y.appendChild(valueY);
@@ -520,13 +520,13 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Color:
 		{
-			type = tqparent.createElement("color");
-			TQDomElement r = tqparent.createElement("red");
-			TQDomElement g = tqparent.createElement("green");
-			TQDomElement b = tqparent.createElement("blue");
-			TQDomText valueR = tqparent.createTextNode(TQString::number(value.toColor().red()));
-			TQDomText valueG = tqparent.createTextNode(TQString::number(value.toColor().green()));
-			TQDomText valueB = tqparent.createTextNode(TQString::number(value.toColor().blue()));
+			type = parent.createElement("color");
+			TQDomElement r = parent.createElement("red");
+			TQDomElement g = parent.createElement("green");
+			TQDomElement b = parent.createElement("blue");
+			TQDomText valueR = parent.createTextNode(TQString::number(value.toColor().red()));
+			TQDomText valueG = parent.createTextNode(TQString::number(value.toColor().green()));
+			TQDomText valueB = parent.createTextNode(TQString::number(value.toColor().blue()));
 
 			r.appendChild(valueR);
 			g.appendChild(valueG);
@@ -539,27 +539,27 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Bool:
 		{
-			type = tqparent.createElement("bool");
-			//valueE = tqparent.createTextNode(TQString::number(value.toBool()));
-			valueE = tqparent.createTextNode(value.toBool() ? "true" : "false");
+			type = parent.createElement("bool");
+			//valueE = parent.createTextNode(TQString::number(value.toBool()));
+			valueE = parent.createTextNode(value.toBool() ? "true" : "false");
 			type.appendChild(valueE);
 			break;
 		}
 		case TQVariant::Int:
 		case TQVariant::UInt:
 		{
-			type = tqparent.createElement("number");
-			valueE = tqparent.createTextNode(TQString::number(value.toInt()));
+			type = parent.createElement("number");
+			valueE = parent.createTextNode(TQString::number(value.toInt()));
 			type.appendChild(valueE);
 			break;
 		}
 		case TQVariant::Size:
 		{
-			type = tqparent.createElement("size");
-			TQDomElement w = tqparent.createElement("width");
-			TQDomElement h = tqparent.createElement("height");
-			TQDomText valueW = tqparent.createTextNode(TQString::number(value.toSize().width()));
-			TQDomText valueH = tqparent.createTextNode(TQString::number(value.toSize().height()));
+			type = parent.createElement("size");
+			TQDomElement w = parent.createElement("width");
+			TQDomElement h = parent.createElement("height");
+			TQDomText valueW = parent.createTextNode(TQString::number(value.toSize().width()));
+			TQDomText valueH = parent.createTextNode(TQString::number(value.toSize().height()));
 
 			w.appendChild(valueW);
 			h.appendChild(valueH);
@@ -570,11 +570,11 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Point:
 		{
-			type = tqparent.createElement("point");
-			TQDomElement x = tqparent.createElement("x");
-			TQDomElement y = tqparent.createElement("y");
-			TQDomText valueX = tqparent.createTextNode(TQString::number(value.toPoint().x()));
-			TQDomText valueY = tqparent.createTextNode(TQString::number(value.toPoint().y()));
+			type = parent.createElement("point");
+			TQDomElement x = parent.createElement("x");
+			TQDomElement y = parent.createElement("y");
+			TQDomText valueX = parent.createTextNode(TQString::number(value.toPoint().x()));
+			TQDomText valueY = parent.createTextNode(TQString::number(value.toPoint().y()));
 
 			x.appendChild(valueX);
 			y.appendChild(valueY);
@@ -585,21 +585,21 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Font:
 		{
-			type = tqparent.createElement("font");
-			TQDomElement f = tqparent.createElement("family");
-			TQDomElement p = tqparent.createElement("pointsize");
-			TQDomElement w = tqparent.createElement("weight");
-			TQDomElement b = tqparent.createElement("bold");
-			TQDomElement i = tqparent.createElement("italic");
-			TQDomElement u = tqparent.createElement("underline");
-			TQDomElement s = tqparent.createElement("strikeout");
-			TQDomText valueF = tqparent.createTextNode(value.toFont().family());
-			TQDomText valueP = tqparent.createTextNode(TQString::number(value.toFont().pointSize()));
-			TQDomText valueW = tqparent.createTextNode(TQString::number(value.toFont().weight()));
-			TQDomText valueB = tqparent.createTextNode(TQString::number(value.toFont().bold()));
-			TQDomText valueI = tqparent.createTextNode(TQString::number(value.toFont().italic()));
-			TQDomText valueU = tqparent.createTextNode(TQString::number(value.toFont().underline()));
-			TQDomText valueS = tqparent.createTextNode(TQString::number(value.toFont().strikeOut()));
+			type = parent.createElement("font");
+			TQDomElement f = parent.createElement("family");
+			TQDomElement p = parent.createElement("pointsize");
+			TQDomElement w = parent.createElement("weight");
+			TQDomElement b = parent.createElement("bold");
+			TQDomElement i = parent.createElement("italic");
+			TQDomElement u = parent.createElement("underline");
+			TQDomElement s = parent.createElement("strikeout");
+			TQDomText valueF = parent.createTextNode(value.toFont().family());
+			TQDomText valueP = parent.createTextNode(TQString::number(value.toFont().pointSize()));
+			TQDomText valueW = parent.createTextNode(TQString::number(value.toFont().weight()));
+			TQDomText valueB = parent.createTextNode(TQString::number(value.toFont().bold()));
+			TQDomText valueI = parent.createTextNode(TQString::number(value.toFont().italic()));
+			TQDomText valueU = parent.createTextNode(TQString::number(value.toFont().underline()));
+			TQDomText valueS = parent.createTextNode(TQString::number(value.toFont().strikeOut()));
 
 			f.appendChild(valueF);
 			p.appendChild(valueP);
@@ -620,22 +620,22 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Cursor:
 		{
-			type = tqparent.createElement("cursor");
-			valueE = tqparent.createTextNode(TQString::number(value.toCursor().tqshape()));
+			type = parent.createElement("cursor");
+			valueE = parent.createTextNode(TQString::number(value.toCursor().tqshape()));
 			type.appendChild(valueE);
 			break;
 		}
 		case TQVariant::SizePolicy:
 		{
-			type = tqparent.createElement("sizepolicy");
-			TQDomElement h = tqparent.createElement("hsizetype");
-			TQDomElement v = tqparent.createElement("vsizetype");
-			TQDomElement hs = tqparent.createElement("horstretch");
-			TQDomElement vs = tqparent.createElement("verstretch");
-			TQDomText valueH = tqparent.createTextNode(TQString::number(value.toSizePolicy().horData()));
-			TQDomText valueV = tqparent.createTextNode(TQString::number(value.toSizePolicy().verData()));
-			TQDomText valueHS = tqparent.createTextNode(TQString::number(value.toSizePolicy().horStretch()));
-			TQDomText valueVS = tqparent.createTextNode(TQString::number(value.toSizePolicy().verStretch()));
+			type = parent.createElement("sizepolicy");
+			TQDomElement h = parent.createElement("hsizetype");
+			TQDomElement v = parent.createElement("vsizetype");
+			TQDomElement hs = parent.createElement("horstretch");
+			TQDomElement vs = parent.createElement("verstretch");
+			TQDomText valueH = parent.createTextNode(TQString::number(value.toSizePolicy().horData()));
+			TQDomText valueV = parent.createTextNode(TQString::number(value.toSizePolicy().verData()));
+			TQDomText valueHS = parent.createTextNode(TQString::number(value.toSizePolicy().horStretch()));
+			TQDomText valueVS = parent.createTextNode(TQString::number(value.toSizePolicy().verStretch()));
 
 			h.appendChild(valueH);
 			v.appendChild(valueV);
@@ -650,13 +650,13 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Time:
 		{
-			type = tqparent.createElement("time");
-			TQDomElement h = tqparent.createElement("hour");
-			TQDomElement m = tqparent.createElement("minute");
-			TQDomElement s = tqparent.createElement("second");
-			TQDomText valueH = tqparent.createTextNode(TQString::number(value.toTime().hour()));
-			TQDomText valueM = tqparent.createTextNode(TQString::number(value.toTime().minute()));
-			TQDomText valueS = tqparent.createTextNode(TQString::number(value.toTime().second()));
+			type = parent.createElement("time");
+			TQDomElement h = parent.createElement("hour");
+			TQDomElement m = parent.createElement("minute");
+			TQDomElement s = parent.createElement("second");
+			TQDomText valueH = parent.createTextNode(TQString::number(value.toTime().hour()));
+			TQDomText valueM = parent.createTextNode(TQString::number(value.toTime().minute()));
+			TQDomText valueS = parent.createTextNode(TQString::number(value.toTime().second()));
 
 			h.appendChild(valueH);
 			m.appendChild(valueM);
@@ -669,13 +669,13 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::Date:
 		{
-			type = tqparent.createElement("date");
-			TQDomElement y = tqparent.createElement("year");
-			TQDomElement m = tqparent.createElement("month");
-			TQDomElement d = tqparent.createElement("day");
-			TQDomText valueY = tqparent.createTextNode(TQString::number(value.toDate().year()));
-			TQDomText valueM = tqparent.createTextNode(TQString::number(value.toDate().month()));
-			TQDomText valueD = tqparent.createTextNode(TQString::number(value.toDate().day()));
+			type = parent.createElement("date");
+			TQDomElement y = parent.createElement("year");
+			TQDomElement m = parent.createElement("month");
+			TQDomElement d = parent.createElement("day");
+			TQDomText valueY = parent.createTextNode(TQString::number(value.toDate().year()));
+			TQDomText valueM = parent.createTextNode(TQString::number(value.toDate().month()));
+			TQDomText valueD = parent.createTextNode(TQString::number(value.toDate().day()));
 
 			y.appendChild(valueY);
 			m.appendChild(valueM);
@@ -688,19 +688,19 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVarian
 		}
 		case TQVariant::DateTime:
 		{
-			type = tqparent.createElement("datetime");
-			TQDomElement h = tqparent.createElement("hour");
-			TQDomElement m = tqparent.createElement("minute");
-			TQDomElement s = tqparent.createElement("second");
-			TQDomElement y = tqparent.createElement("year");
-			TQDomElement mo = tqparent.createElement("month");
-			TQDomElement d = tqparent.createElement("day");
-			TQDomText valueH = tqparent.createTextNode(TQString::number(value.toDateTime().time().hour()));
-			TQDomText valueM = tqparent.createTextNode(TQString::number(value.toDateTime().time().minute()));
-			TQDomText valueS = tqparent.createTextNode(TQString::number(value.toDateTime().time().second()));
-			TQDomText valueY = tqparent.createTextNode(TQString::number(value.toDateTime().date().year()));
-			TQDomText valueMo = tqparent.createTextNode(TQString::number(value.toDateTime().date().month()));
-			TQDomText valueD = tqparent.createTextNode(TQString::number(value.toDateTime().date().day()));
+			type = parent.createElement("datetime");
+			TQDomElement h = parent.createElement("hour");
+			TQDomElement m = parent.createElement("minute");
+			TQDomElement s = parent.createElement("second");
+			TQDomElement y = parent.createElement("year");
+			TQDomElement mo = parent.createElement("month");
+			TQDomElement d = parent.createElement("day");
+			TQDomText valueH = parent.createTextNode(TQString::number(value.toDateTime().time().hour()));
+			TQDomText valueM = parent.createTextNode(TQString::number(value.toDateTime().time().minute()));
+			TQDomText valueS = parent.createTextNode(TQString::number(value.toDateTime().time().second()));
+			TQDomText valueY = parent.createTextNode(TQString::number(value.toDateTime().date().year()));
+			TQDomText valueMo = parent.createTextNode(TQString::number(value.toDateTime().date().month()));
+			TQDomText valueD = parent.createTextNode(TQString::number(value.toDateTime().date().day()));
 
 			h.appendChild(valueH);
 			m.appendChild(valueM);
@@ -909,7 +909,7 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name)
 /////////////////////////////////////////////////////////////////////////////
 
 void
-FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &domDoc, bool insideGridLayout)
+FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &domDoc, bool insideGridLayout)
 {
 	if (!item)
 		return;
@@ -917,7 +917,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 	// we let Spring class handle saving itself
 	if(item->className() == "Spring")
 	{
-		Spring::saveSpring(item, tqparent, domDoc, insideGridLayout);
+		Spring::saveSpring(item, parent, domDoc, insideGridLayout);
 		return;
 	}
 
@@ -926,7 +926,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 	if(!m_currentForm) // copying widget
 	{
 		resetCurrentForm = true;
-		m_currentForm = item->container() ? item->container()->form() : item->tqparent()->container()->form();
+		m_currentForm = item->container() ? item->container()->form() : item->parent()->container()->form();
 	}
 
 
@@ -934,11 +934,11 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 //	if(item->container())
 //		lib = item->container()->form()->manager()->lib();
 //	else
-//		lib = item->tqparent()->container()->form()->manager()->lib();
+//		lib = item->parent()->container()->form()->manager()->lib();
 
 	// We create the "widget" element
 	TQDomElement tclass = domDoc.createElement("widget");
-	tqparent.appendChild(tclass);
+	parent.appendChild(tclass);
 
 	if(insideGridLayout)
 	{
@@ -951,7 +951,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 		}
 	}
 
-	if(!item->tqparent()) // Toplevel widget
+	if(!item->parent()) // Toplevel widget
 		tclass.setAttribute("class", TQWIDGET_OBJECT_NAME_STRING);
 	// For compatibility, HBox, VBox and Grid are saved as TQLAYOUTWIDGET_OBJECT_NAME_STRING
 	else if(item->widget()->isA("HBox") || item->widget()->isA("VBox") || item->widget()->isA("Grid")
@@ -971,15 +971,15 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 //	if (-1 != item->widget()->tqmetaObject()->findProperty("dataSource"))
 	//	savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget());
 
-	// We don't want to save the tqgeometry if the widget is inside a tqlayout (so tqparent.tagName() == "grid" for example)
-	if(item && !item->tqparent()) {
+	// 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",
 			TQRect( TQPoint(0,0), item->widget()->size()),
 			item->widget());
 	}
 	// normal widget (if == "UI', it means we're copying widget)
-	else if(tqparent.tagName() == "widget" || tqparent.tagName() == "UI")
+	else if(parent.tagName() == "widget" || parent.tagName() == "UI")
 		savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget());
 
 	// Save the buddy widget for a label
@@ -1116,7 +1116,7 @@ FormIO::cleanClipboard(TQDomElement &uiElement)
 }
 
 void
-FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqparent)
+FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *parent)
 {
 	bool resetCurrentForm = false;
 	if(!m_currentForm) // pasting widget
@@ -1187,11 +1187,11 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqpar
 			widgetOptions ^= WidgetFactory::DesignViewMode;
 		}
 
-		if(!tqparent)
+		if(!parent)
 			w = container->form()->library()->createWidget(classname, container->widget(), 
 				wname.latin1(), container, widgetOptions);
 		else
-			w = container->form()->library()->createWidget(classname, tqparent, wname.latin1(), 
+			w = container->form()->library()->createWidget(classname, parent, wname.latin1(), 
 				container, widgetOptions);
 	}
 
@@ -1213,12 +1213,12 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqpar
 		// not yet created
 		item =  new ObjectTreeItem(container->form()->library()->displayName(classname), 
 			wname, w, container);
-		if(tqparent)  {
-			ObjectTreeItem *titem = container->form()->objectTree()->lookup(tqparent->name());
+		if(parent)  {
+			ObjectTreeItem *titem = container->form()->objectTree()->lookup(parent->name());
 			if(titem)
 				container->form()->objectTree()->addItem(titem, item);
 			else
-				kdDebug() << "FORMIO :: ERROR no tqparent widget "  << endl;
+				kdDebug() << "FORMIO :: ERROR no parent widget "  << endl;
 		}
 		else
 			container->form()->objectTree()->addItem(container->objectTree(), item);
diff --git a/kexi/formeditor/formIO.h b/kexi/formeditor/formIO.h
index 5556b2400..bb272a13e 100644
--- a/kexi/formeditor/formIO.h
+++ b/kexi/formeditor/formIO.h
@@ -42,7 +42,7 @@ class KFORMEDITOR_EXPORT CustomWidget : public TQWidget
   TQ_OBJECT
 
 	public:
-		CustomWidget(const TQCString &className, TQWidget *tqparent, const char *name);
+		CustomWidget(const TQCString &className, TQWidget *parent, const char *name);
 		virtual ~CustomWidget();
 
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -127,13 +127,13 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 		static bool loadFormFromFile(Form *form, TQWidget *container, const TQString &filename=TQString());
 
 		/*! Saves the widget associated to the ObjectTreeItem \a item into DOM document \a domDoc,
-		    with \a tqparent as tqparent node.
+		    with \a parent as parent node.
 		    It calls readPropertyValue() for each object property, readAttribute() for each attribute and
 		    itself to save child widgets.\n
 		    \return true if saving succeeded.
 		    This is used to copy/paste widgets.
 		*/
-		static void saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &domDoc,
+		static void saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &domDoc,
 			bool insideGridLayout=false);
 
 		/*! Cleans the "UI" TQDomElement after saving widget. It deletes the "includes" element
@@ -142,12 +142,12 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 		static void cleanClipboard(TQDomElement &uiElement);
 
 		/*! Loads the widget associated to the TQDomElement \a el into the Container \a container,
-		    with \a tqparent as tqparent widget.
-		    If tqparent = 0, the Container::widget() is used as tqparent widget.
+		    with \a parent as parent widget.
+		    If parent = 0, the Container::widget() is used as parent widget.
 		    This is used to copy/paste widgets.
 		*/
 		static void loadWidget(Container *container,
-			const TQDomElement &el, TQWidget *tqparent=0);
+			const TQDomElement &el, TQWidget *parent=0);
 
 		/*! Save an element in the \a domDoc as child of \a parentNode.
 		  The element will be saved like this :
@@ -174,15 +174,15 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 			 Properties of subwidget are saved with subwidget="true" arribute added 
 			 to 'property' XML element.
 		*/
-		static void savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, const char *name,
+		static void savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const char *name,
 			const TQVariant &value, TQWidget *w, WidgetLibrary *lib=0);
 
 	protected:
 		/*! Saves the TQVariant \a value as text to be included in an xml file, with \a parentNode.*/
-		static void writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVariant value);
+		static void writeVariant(TQDomDocument &parent, TQDomElement &parentNode, TQVariant value);
 
 		/*! Creates a toplevel widget from the TQDomElement \a element in the Form \a form,
-		 with \a tqparent as tqparent widget.
+		 with \a parent as parent widget.
 		 It calls readPropertyValue() and loadWidget() to load child widgets.
 		*/
 		static void createToplevelWidget(Form *form, TQWidget *container, TQDomElement &element);
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 66948abb1..ce25d7100 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -83,8 +83,8 @@ namespace KFormDesigner {
 class PropertyFactory : public KoProperty::CustomPropertyFactory
 {
 	public:
-		PropertyFactory(TQObject *tqparent) 
-		: KoProperty::CustomPropertyFactory(tqparent)
+		PropertyFactory(TQObject *parent) 
+		: KoProperty::CustomPropertyFactory(parent)
 //			m_manager(manager)
 		{
 		}
@@ -105,8 +105,8 @@ using namespace KFormDesigner;
 static KStaticDeleter<FormManager> m_managerDeleter;
 FormManager* FormManager::_self = 0L;
 
-FormManager::FormManager(TQObject *tqparent, int options, const char *name)
-   : TQObject(tqparent, name)
+FormManager::FormManager(TQObject *parent, int options, const char *name)
+   : TQObject(parent, name)
 #ifdef KEXI_DEBUG_GUI
    , m_uiCodeDialog(0)
    , m_options(options)
@@ -698,7 +698,7 @@ FormManager::isTopLevel(TQWidget *w)
 	if(!item)
 		return true;
 
-	return (!item->tqparent());
+	return (!item->parent());
 }
 
 void
@@ -734,8 +734,8 @@ FormManager::copyWidget()
 
 	// We clear the current clipboard
 	m_domDoc.setContent(TQString(), true);
-	TQDomElement tqparent = m_domDoc.createElement("UI");
-	m_domDoc.appendChild(tqparent);
+	TQDomElement parent = m_domDoc.createElement("UI");
+	m_domDoc.appendChild(parent);
 
 	TQWidget *w;
 	for(w = list->first(); w; w = list->next())
@@ -744,10 +744,10 @@ FormManager::copyWidget()
 		if (!it)
 			continue;
 
-		FormIO::saveWidget(it, tqparent, m_domDoc);
+		FormIO::saveWidget(it, parent, m_domDoc);
 	}
 
-	FormIO::cleanClipboard(tqparent);
+	FormIO::cleanClipboard(parent);
 
 	activeForm()->emitActionSignals(); // to update 'Paste' item state
 }
@@ -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 enabletqlayout creation if more than one widget with the same tqparent 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;
@@ -1109,15 +1109,15 @@ FormManager::createLayout(int layoutType)
 		return;
 	}
 
-	TQWidget *tqparent = list->first()->parentWidget();
+	TQWidget *parent = list->first()->parentWidget();
 	for(TQWidget *w = list->first(); w; w = list->next())
 	{
-		kdDebug() << "comparing widget " << w->name() << " whose tqparent is " << w->parentWidget()->name() << " insteaed of " << tqparent->name() << endl;
-		if(w->parentWidget() != tqparent)
+		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()->tqtopLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
-		   "All selected widgets must have the same tqparent."));
-			kdDebug() << "FormManager::createLayout() widgets don't have the same tqparent widget" << endl;
+		   "All selected widgets must have the same parent."));
+			kdDebug() << "FormManager::createLayout() widgets don't have the same parent widget" << endl;
 			return;
 		}
 	}
@@ -1250,7 +1250,7 @@ FormManager::alignWidgets(int type)
 	{
 		if(w->parentWidget() != parentWidget)
 		{
-			kdDebug() << "FormManager::alignWidgets() type ==" << type <<  " widgets don't have the same tqparent widget" << endl;
+			kdDebug() << "FormManager::alignWidgets() type ==" << type <<  " widgets don't have the same parent widget" << endl;
 			return;
 		}
 	}
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index e7934cc24..a43100fff 100644
--- a/kexi/formeditor/formmanager.h
+++ b/kexi/formeditor/formmanager.h
@@ -77,7 +77,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 	public:
 		/*! Constructs FormManager object.
 		 Using \a options you can control manager's behaviour, see Options. */
-		FormManager(TQObject *tqparent = 0, int options = 0, const char *name = 0);
+		FormManager(TQObject *parent = 0, int options = 0, const char *name = 0);
 
 		virtual ~FormManager();
 
@@ -419,7 +419,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		virtual bool saveFormToStringInternal(Form *form, TQString &dest, int indent = 0);
 #endif
 		/*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the
-		  currently selected widgets (that must have the same tqparent).
+		  currently selected widgets (that must have the same parent).
 		  Calls \ref CreateLayoutCommand. */
 		void createLayout(int layoutType);
 
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
index 8ab3ae0d6..7166e7cc6 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
@@ -123,8 +123,8 @@ class KFDPart_FormManager : public KFormDesigner::FormManager
 
 KFormDesigner::WidgetLibrary* KFormDesignerKDevPart::static_formsLibrary = 0L;
 
-KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *tqparent, const char *name, bool readOnly, const TQStringList &args)
-: Designer(tqparent, name), m_count(0)
+KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *parent, const char *name, bool readOnly, const TQStringList &args)
+: Designer(parent, name), m_count(0)
 {
 	setInstance(KFDFactory::instance());
 	instance()->iconLoader()->addAppDir("kexi");
@@ -138,7 +138,7 @@ KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *tqparent, const char *nam
 		setUniqueFormMode(false);
 	m_inShell = (!args.grep("shell").isEmpty());
 
-	TQHBox *container = new TQHBox(tqparent, "kfd_container_widget");
+	TQHBox *container = new TQHBox(parent, "kfd_container_widget");
 	container->setFocusPolicy(TQ_ClickFocus);
 
 	m_workspace = new TQWorkspace(container, "kfd_workspace");
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
index 72f2ef82f..b6929e5cc 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
@@ -45,7 +45,7 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 		KFDFactory();
 		virtual ~KFDFactory();
 
-		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *parent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
@@ -61,7 +61,7 @@ class KFORMEDITOR_EXPORT KFormDesignerKDevPart : public Designer
   TQ_OBJECT
 
 	public:
-		KFormDesignerKDevPart(TQWidget *tqparent, const char *name, bool readOnly=true, const TQStringList &args=TQStringList());
+		KFormDesignerKDevPart(TQWidget *parent, const char *name, bool readOnly=true, const TQStringList &args=TQStringList());
 		virtual ~KFormDesignerKDevPart();
 
 		virtual DesignerType designerType() { return TQtDesigner; }
@@ -119,8 +119,8 @@ class KFORMEDITOR_EXPORT FormWidgetBase : public TQWidget, public KFormDesigner:
   TQ_OBJECT
 
 	public:
-		FormWidgetBase(KFormDesignerKDevPart *part, TQWidget *tqparent = 0, const char *name = 0, int WFlags = WDestructiveClose)
-		: TQWidget(tqparent, name, WFlags), m_part(part) {}
+		FormWidgetBase(KFormDesignerKDevPart *part, TQWidget *parent = 0, const char *name = 0, int WFlags = WDestructiveClose)
+		: TQWidget(parent, name, WFlags), m_part(part) {}
 		~FormWidgetBase() {;}
 
 		void drawRect(const TQRect& r, int type);
diff --git a/kexi/formeditor/kfdpixmapedit.cpp b/kexi/formeditor/kfdpixmapedit.cpp
index caadca855..db9a726e6 100644
--- a/kexi/formeditor/kfdpixmapedit.cpp
+++ b/kexi/formeditor/kfdpixmapedit.cpp
@@ -29,8 +29,8 @@
 
 using namespace KFormDesigner;
 
-KFDPixmapEdit::KFDPixmapEdit(KoProperty::Property *property, TQWidget *tqparent, const char *name)
- : KoProperty::PixmapEdit(property, tqparent, name)
+KFDPixmapEdit::KFDPixmapEdit(KoProperty::Property *property, TQWidget *parent, const char *name)
+ : KoProperty::PixmapEdit(property, parent, name)
 {
 //	m_manager = manager;
 }
diff --git a/kexi/formeditor/kfdpixmapedit.h b/kexi/formeditor/kfdpixmapedit.h
index 181ed0433..cac2b751f 100644
--- a/kexi/formeditor/kfdpixmapedit.h
+++ b/kexi/formeditor/kfdpixmapedit.h
@@ -30,7 +30,7 @@ class KFORMEDITOR_EXPORT KFDPixmapEdit : public KoProperty::PixmapEdit
   TQ_OBJECT
 
 	public:
-		KFDPixmapEdit(KoProperty::Property *property, TQWidget *tqparent=0, const char *name=0);
+		KFDPixmapEdit(KoProperty::Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~KFDPixmapEdit();
 
 	public slots:
diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp
index a00fbcbb2..e2ada7143 100644
--- a/kexi/formeditor/objecttree.cpp
+++ b/kexi/formeditor/objecttree.cpp
@@ -169,15 +169,15 @@ ObjectTree::rename(const TQString &oldname, const TQString &newname)
 }
 
 bool
-ObjectTree::reparent(const TQString &name, const TQString &newtqparent)
+ObjectTree::reparent(const TQString &name, const TQString &newparent)
 {
 	ObjectTreeItem *item = lookup(name);
 	if(!item)   return false;
-	ObjectTreeItem *tqparent = lookup(newtqparent);
-	if(!tqparent)   return false;
+	ObjectTreeItem *parent = lookup(newparent);
+	if(!parent)   return false;
 
-	item->tqparent()->removeChild(item);
-	tqparent->addChild(item);
+	item->parent()->removeChild(item);
+	parent->addChild(item);
 	return true;
 }
 
@@ -191,16 +191,16 @@ ObjectTree::lookup(const TQString &name)
 }
 
 void
-ObjectTree::addItem(ObjectTreeItem *tqparent, ObjectTreeItem *c)
+ObjectTree::addItem(ObjectTreeItem *parent, ObjectTreeItem *c)
 {
 	m_treeDict.insert(c->name(), c);
 
-	if(!tqparent)
-		tqparent = this;
-	tqparent->addChild(c);
+	if(!parent)
+		parent = this;
+	parent->addChild(c);
 	m_container->form()->emitChildAdded(c);
 
-	kdDebug() << "ObjectTree::addItem(): adding " << c->name() << " to " << tqparent->name() << endl;
+	kdDebug() << "ObjectTree::addItem(): adding " << c->name() << " to " << parent->name() << endl;
 }
 
 void
@@ -220,7 +220,7 @@ ObjectTree::removeItem(ObjectTreeItem *c)
 		removeItem(it->name());
 
 	m_treeDict.remove(c->name());
-	c->tqparent()->removeChild(c);
+	c->parent()->removeChild(c);
 	delete c;
 }
 
diff --git a/kexi/formeditor/objecttree.h b/kexi/formeditor/objecttree.h
index ae9b1e262..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, tqparent, tqchildren ..).
+ Holds the properties of a widget (classname, name, parent, tqchildren ..).
  @author Lucijan Busch <lucijan@kde.org>
  */
 class KFORMEDITOR_EXPORT ObjectTreeItem
@@ -71,7 +71,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 		TQString className() const { return m_className; }
 		TQWidget* widget() const { return m_widget; }
 		EventEater* eventEater() const { return m_eater; }
-		ObjectTreeItem* tqparent() const { return m_parent; }
+		ObjectTreeItem* parent() const { return m_parent; }
 		ObjectTreeList* tqchildren() { return &m_tqchildren; }
 
 		/*! \return a TQMap<TQString, TQVariant> of all modified properties for this widget.
@@ -82,7 +82,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 		Container* container() const { return m_container;}
 
 		void setWidget(TQWidget *w) { m_widget = w; }
-		void setParent(ObjectTreeItem *tqparent)  { m_parent = tqparent;}
+		void setParent(ObjectTreeItem *parent)  { m_parent = parent;}
 
 		void debug(int ident);
 		void rename(const TQString &name);
@@ -152,8 +152,8 @@ class KFORMEDITOR_EXPORT ObjectTree : public ObjectTreeItem
 		/*! Renames the item named \a oldname to \a newname. \return false if widget named \a newname
 		 already exists and renaming failed. */
 		bool rename(const TQString &oldname, const TQString &newname );
-		/*! Sets \a newtqparent as new tqparent for the item whose name is \a name. */
-		bool reparent(const TQString &name, const TQString &newtqparent);
+		/*! Sets \a newparent as new parent for the item whose name is \a name. */
+		bool reparent(const TQString &name, const TQString &newparent);
 
 		/*! \return the ObjectTreeItem named \a name, or 0 if doesn't exist. */
 		ObjectTreeItem* lookup(const TQString &name);
@@ -162,7 +162,7 @@ class KFORMEDITOR_EXPORT ObjectTree : public ObjectTreeItem
 		this dict, use ObjectTreeDictIterator. */
 		ObjectTreeDict* dict() { return &m_treeDict; }
 
-		void addItem(ObjectTreeItem *tqparent, ObjectTreeItem *c);
+		void addItem(ObjectTreeItem *parent, ObjectTreeItem *c);
 		void removeItem(const TQString &name);
 		void removeItem(ObjectTreeItem *c);
 
diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp
index e6802d81d..049df3a56 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -34,8 +34,8 @@
 
 using namespace KFormDesigner;
 
-ObjectTreeViewItem::ObjectTreeViewItem(ObjectTreeViewItem *tqparent, ObjectTreeItem *item)
- : KListViewItem(tqparent, item->name(), item->className())
+ObjectTreeViewItem::ObjectTreeViewItem(ObjectTreeViewItem *parent, ObjectTreeItem *item)
+ : KListViewItem(parent, item->name(), item->className())
 {
 	m_item = item;
 }
@@ -163,8 +163,8 @@ ObjectTreeViewItem::setOpen( bool o )
 
 // ObjectTreeView itself ----------------
 
-ObjectTreeView::ObjectTreeView(TQWidget *tqparent, const char *name, bool tabStop)
- : KListView(tqparent, name)
+ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop)
+ : KListView(parent, name)
  , m_form(0)
 {
 	addColumn(i18n("Name"), 130);
@@ -290,13 +290,13 @@ ObjectTreeView::slotSelectionChanged()
 void
 ObjectTreeView::addItem(ObjectTreeItem *item)
 {
-	ObjectTreeViewItem *tqparent=0;
+	ObjectTreeViewItem *parent=0;
 
-	tqparent = findItem(item->tqparent()->name());
-	if(!tqparent)
+	parent = findItem(item->parent()->name());
+	if(!parent)
 		return;
 
-	loadTree(item, tqparent);
+	loadTree(item, parent);
 }
 
 void
@@ -354,15 +354,15 @@ ObjectTreeView::slotBeforeFormDestroyed()
 }
 
 ObjectTreeViewItem*
-ObjectTreeView::loadTree(ObjectTreeItem *item, ObjectTreeViewItem *tqparent)
+ObjectTreeView::loadTree(ObjectTreeItem *item, ObjectTreeViewItem *parent)
 {
 	if(!item)
 		return 0;
-	ObjectTreeViewItem *treeItem = new ObjectTreeViewItem(tqparent, item);
+	ObjectTreeViewItem *treeItem = new ObjectTreeViewItem(parent, item);
 	treeItem->setOpen(true);
 
 	// The item is inserted by default at the beginning, but we want it to be at the end, so we move it
-	TQListViewItem *last = tqparent->firstChild();
+	TQListViewItem *last = parent->firstChild();
 	while(last->nextSibling())
 		last = last->nextSibling();
 	treeItem->moveItem(last);
diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h
index 46266144b..b625c0ad2 100644
--- a/kexi/formeditor/objecttreeview.h
+++ b/kexi/formeditor/objecttreeview.h
@@ -31,7 +31,7 @@ class Form;
 class KFORMEDITOR_EXPORT ObjectTreeViewItem : public KListViewItem
 {
 	public:
-		ObjectTreeViewItem(ObjectTreeViewItem *tqparent, ObjectTreeItem *item);
+		ObjectTreeViewItem(ObjectTreeViewItem *parent, ObjectTreeItem *item);
 		ObjectTreeViewItem(KListView *list, ObjectTreeItem *item=0);
 		virtual ~ObjectTreeViewItem();
 
@@ -70,7 +70,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView
   TQ_OBJECT
 
 	public:
-		ObjectTreeView(TQWidget *tqparent=0, const char *name=0, bool tabStop = false);
+		ObjectTreeView(TQWidget *parent=0, const char *name=0, bool tabStop = false);
 		virtual ~ObjectTreeView();
 
 		virtual TQSize tqsizeHint() const;
@@ -89,7 +89,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView
 		 It is added to current selection if \a add is true. */
 		void setSelectedWidget(TQWidget *w, bool add=false);
 
-		/*! Adds the ObjectTreeItem \a item in the list, with the appropriate tqparent. */
+		/*! Adds the ObjectTreeItem \a item in the list, with the appropriate parent. */
 		void addItem(ObjectTreeItem *item);
 
 		/*! Removess the ObjectTreeItem \a item from the list. */
@@ -113,7 +113,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView
 
 	protected:
 		//! Internal function to fill the list.
-		ObjectTreeViewItem* loadTree(ObjectTreeItem *item, ObjectTreeViewItem *tqparent);
+		ObjectTreeViewItem* loadTree(ObjectTreeItem *item, ObjectTreeViewItem *parent);
 
 		//! \return The item whose name is \a name.
 		ObjectTreeViewItem* findItem(const TQString &name);
diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp
index c2448c6eb..bdd0e3b07 100644
--- a/kexi/formeditor/resizehandle.cpp
+++ b/kexi/formeditor/resizehandle.cpp
@@ -220,7 +220,7 @@ void ResizeHandle::mouseMoveEvent(TQMouseEvent *ev)
 		tmph = MINIMUM_HEIGHT;
 	}
 
-	// Do not resize a widget outside of tqparent boundaries
+	// Do not resize a widget outside of parent boundaries
 	if(tmpx < 0)
 	{
 		tmpw += tmpx;
@@ -281,7 +281,7 @@ ResizeHandleSet::ResizeHandleSet(TQWidget *modify, Form *form, bool editing)
 : TQObject(modify->parentWidget()), /*m_widget(modify),*/ m_form(form)
 {
 	m_widget = 0;
-	/*TQWidget *tqparent = modify->parentWidget();
+	/*TQWidget *parent = modify->parentWidget();
 
 	handles[0] = new ResizeHandle( modify, ResizeHandle::TopLeft, editing);
 	handles[1] = new ResizeHandle( modify, ResizeHandle::TopCenter, editing);
diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp
index 74a31ab0e..168102b02 100644
--- a/kexi/formeditor/richtextdialog.cpp
+++ b/kexi/formeditor/richtextdialog.cpp
@@ -33,8 +33,8 @@ namespace KFormDesigner {
 //////////////// A simple dialog to edit rich text   ////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 
-RichTextDialog::RichTextDialog(TQWidget *tqparent, const TQString &text)
-: KDialogBase(tqparent, "richtext_dialog", true, i18n("Edit Rich Text"), Ok|Cancel, Ok, false)
+RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text)
+: KDialogBase(parent, "richtext_dialog", true, i18n("Edit Rich Text"), Ok|Cancel, Ok, false)
 {
 	TQFrame *frame = makeMainWidget();
 	TQVBoxLayout *l = new TQVBoxLayout(frame);
diff --git a/kexi/formeditor/richtextdialog.h b/kexi/formeditor/richtextdialog.h
index 66a04e16c..25150873a 100644
--- a/kexi/formeditor/richtextdialog.h
+++ b/kexi/formeditor/richtextdialog.h
@@ -37,7 +37,7 @@ class KFORMEDITOR_EXPORT RichTextDialog : public KDialogBase
   TQ_OBJECT
 
 	public:
-		RichTextDialog(TQWidget *tqparent, const TQString &text);
+		RichTextDialog(TQWidget *parent, const TQString &text);
 		~RichTextDialog(){;}
 
 		TQString  text();
diff --git a/kexi/formeditor/scripting/scriptmanager.cpp b/kexi/formeditor/scripting/scriptmanager.cpp
index cfc5df045..73bf70e34 100644
--- a/kexi/formeditor/scripting/scriptmanager.cpp
+++ b/kexi/formeditor/scripting/scriptmanager.cpp
@@ -27,8 +27,8 @@
 
 using KFormDesigner::Form;
 
-ScriptManager::ScriptManager(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+ScriptManager::ScriptManager(TQObject *parent, const char *name)
+ : TQObject(parent, name)
 {
 	m_manager = Kross::Api::Manager::scriptManager();
 	m_dict.setAutoDelete(true);
diff --git a/kexi/formeditor/scripting/scriptmanager.h b/kexi/formeditor/scripting/scriptmanager.h
index bc97ec3cf..07cacbd0b 100644
--- a/kexi/formeditor/scripting/scriptmanager.h
+++ b/kexi/formeditor/scripting/scriptmanager.h
@@ -44,7 +44,7 @@ class ScriptManager : public TQObject
   TQ_OBJECT
 
 	public:
-		ScriptManager(TQObject *tqparent=0, const char *name=0);
+		ScriptManager(TQObject *parent=0, const char *name=0);
 		~ScriptManager();
 
 		/*! \return The FormScript object associated to this Form. */
diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp
index be8cfb4a6..1ec9a2b4f 100644
--- a/kexi/formeditor/spring.cpp
+++ b/kexi/formeditor/spring.cpp
@@ -33,8 +33,8 @@
 
 #include "spring.h"
 
-Spring::Spring(TQWidget *tqparent, const char *name)
-  : TQWidget(tqparent, name)
+Spring::Spring(TQWidget *parent, const char *name)
+  : TQWidget(parent, name)
 {
 	m_edit = true;
 	m_orient =Qt::Horizontal;
diff --git a/kexi/formeditor/spring.h b/kexi/formeditor/spring.h
index b75249d92..2e139a3c2 100644
--- a/kexi/formeditor/spring.h
+++ b/kexi/formeditor/spring.h
@@ -48,11 +48,11 @@ class KFORMEDITOR_EXPORT Spring : public TQWidget
 		    Expanding = MinimumExpanding|MayShrink };
 
 	public:
-		Spring(TQWidget *tqparent, const char *name);
+		Spring(TQWidget *parent, const char *name);
 		~Spring() {;}
 
 		static bool isPropertyVisible(const TQCString &name);
-		static void saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &domDoc, bool insideGridLayout);
+		static void saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &domDoc, bool insideGridLayout);
 
 		void setOrientation(Qt::Orientation orient);
 		Qt::Orientation orientation() const { return m_orient;}
diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp
index 6de89b717..f28c8e2a9 100644
--- a/kexi/formeditor/tabstopdialog.cpp
+++ b/kexi/formeditor/tabstopdialog.cpp
@@ -37,8 +37,8 @@ using namespace KFormDesigner;
 //////////  The Tab Stop Dialog to edit tab order  ///////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 
-TabStopDialog::TabStopDialog(TQWidget *tqparent)
-: KDialogBase(tqparent, "tabstop_dialog", true, i18n("Edit Tab Order"), Ok|Cancel, Ok, false)
+TabStopDialog::TabStopDialog(TQWidget *parent)
+: KDialogBase(parent, "tabstop_dialog", true, i18n("Edit Tab Order"), Ok|Cancel, Ok, false)
 {
 	TQFrame *frame = makeMainWidget();
 	TQGridLayout *l = new TQGridLayout(frame, 2, 2, 0, 6);
@@ -147,7 +147,7 @@ void
 TabStopDialog::updateButtons(TQListViewItem *item)
 {
 	m_btnUp->setEnabled( item && (item->itemAbove() && m_treeview->isEnabled()
-	/*&& (item->itemAbove()->tqparent() == item->tqparent()))*/ ));
+	/*&& (item->itemAbove()->parent() == item->parent()))*/ ));
 	m_btnDown->setEnabled( item && item->nextSibling() && m_treeview->isEnabled() );
 }
 
diff --git a/kexi/formeditor/tabstopdialog.h b/kexi/formeditor/tabstopdialog.h
index 52b919be6..d08297773 100644
--- a/kexi/formeditor/tabstopdialog.h
+++ b/kexi/formeditor/tabstopdialog.h
@@ -41,7 +41,7 @@ class KFORMEDITOR_EXPORT TabStopDialog : public KDialogBase
   TQ_OBJECT
 
 	public:
-		TabStopDialog(TQWidget *tqparent);
+		TabStopDialog(TQWidget *parent);
 		virtual ~TabStopDialog();
 
 	public slots:
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index d95e96ae6..f309283f0 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -123,8 +123,8 @@ KFDFactory::aboutData()
 
 KFormDesigner::WidgetLibrary* KFormDesignerPart::static_formsLibrary = 0L;
 
-KFormDesignerPart::KFormDesignerPart(TQWidget *tqparent, const char *name, bool readOnly, const TQStringList &args)
-: KParts::ReadWritePart(tqparent, name), m_count(0)
+KFormDesignerPart::KFormDesignerPart(TQWidget *parent, const char *name, bool readOnly, const TQStringList &args)
+: KParts::ReadWritePart(parent, name), m_count(0)
 {
 	setInstance(KFDFactory::instance());
 	instance()->iconLoader()->addAppDir("kexi");
@@ -138,7 +138,7 @@ KFormDesignerPart::KFormDesignerPart(TQWidget *tqparent, const char *name, bool
 		setUniqueFormMode(false);
 	m_inShell = (!args.grep("shell").isEmpty());
 
-	TQHBox *container = new TQHBox(tqparent, "kfd_container_widget");
+	TQHBox *container = new TQHBox(parent, "kfd_container_widget");
 
 	m_workspace = new TQWorkspace(container, "kfd_workspace");
 	m_workspace->show();
diff --git a/kexi/formeditor/test/kfd_part.h b/kexi/formeditor/test/kfd_part.h
index 5b264b035..cb2874ae0 100644
--- a/kexi/formeditor/test/kfd_part.h
+++ b/kexi/formeditor/test/kfd_part.h
@@ -44,7 +44,7 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 		KFDFactory();
 		virtual ~KFDFactory();
 
-		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *parent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
@@ -60,7 +60,7 @@ class KFORMEDITOR_EXPORT KFormDesignerPart: public KParts::ReadWritePart
   TQ_OBJECT
 
 	public:
-		KFormDesignerPart(TQWidget *tqparent, const char *name, bool readOnly=true, const TQStringList &args=TQStringList());
+		KFormDesignerPart(TQWidget *parent, const char *name, bool readOnly=true, const TQStringList &args=TQStringList());
 		virtual ~KFormDesignerPart();
 
 		static KFormDesigner::WidgetLibrary* formsLibrary();
@@ -122,8 +122,8 @@ class KFORMEDITOR_EXPORT FormWidgetBase : public TQWidget, public KFormDesigner:
   TQ_OBJECT
 
 	public:
-		FormWidgetBase(KFormDesignerPart *part, TQWidget *tqparent = 0, const char *name = 0, int WFlags = WDestructiveClose)
-		: TQWidget(tqparent, name, WFlags), m_part(part) {}
+		FormWidgetBase(KFormDesignerPart *part, TQWidget *parent = 0, const char *name = 0, int WFlags = WDestructiveClose)
+		: TQWidget(parent, name, WFlags), m_part(part) {}
 		~FormWidgetBase() {;}
 
 		void drawRect(const TQRect& r, int type);
diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h
index 30bbfdf3a..3d078401a 100644
--- a/kexi/formeditor/utils.h
+++ b/kexi/formeditor/utils.h
@@ -33,8 +33,8 @@ namespace KFormDesigner {
 
 class Form;
 
-/*! \return tqparent object of \a o that inherits \a className or NULL if no such tqparent
- If the tqparent is found, \a prevPrev is set to a child of child of the tqparent, 
+/*! \return parent object of \a o that inherits \a className or NULL if no such parent
+ If the parent is found, \a prevPrev is set to a child of child of the parent, 
  what for TabWidget means the page widget. */
 template<class type>
 type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className, TQObject* &prevPrev)
@@ -42,7 +42,7 @@ type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className, TQObject* &prev
 	if (!o || !className || className[0]=='\0')
 		return 0;
 	TQObject *prev = TQT_TQOBJECT(o);
-	while ( ((o=TQT_TQOBJECT(o)->tqparent())) && !TQT_TQOBJECT(o)->inherits(className) ) {
+	while ( ((o=TQT_TQOBJECT(o)->parent())) && !TQT_TQOBJECT(o)->inherits(className) ) {
 		prevPrev = prev;
 		prev = TQT_TQOBJECT(o);
 	}
@@ -55,8 +55,8 @@ class KFORMEDITOR_EXPORT TabWidget : public TabWidgetBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		TabWidget(TQWidget *tqparent, const char *name) 
-		 : TabWidgetBase(tqparent, name) {}
+		TabWidget(TQWidget *parent, const char *name) 
+		 : TabWidgetBase(parent, name) {}
 		virtual ~TabWidget() {}
 		int tabBarHeight() const { return tabBar()->height(); }
 };
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 3e0458b95..178e2b748 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -147,8 +147,8 @@ int WidgetInfo::customTypeForProperty(const char *propertyName) const
 
 ///// Widget Factory //////////////////////////
 
-WidgetFactory::WidgetFactory(TQObject *tqparent, const char *name)
- : TQObject(tqparent, (const char*)(TQCString("kformdesigner_")+name))
+WidgetFactory::WidgetFactory(TQObject *parent, const char *name)
+ : TQObject(parent, (const char*)(TQCString("kformdesigner_")+name))
 {
 	m_showAdvancedProperties = true;
 	m_classesByName.setAutoDelete(true);
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index eab422ce0..9e5856255 100644
--- a/kexi/formeditor/widgetfactory.h
+++ b/kexi/formeditor/widgetfactory.h
@@ -268,7 +268,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 			DefaultOptions = AnyOrientation | DesignViewMode
 		};
 
-		WidgetFactory(TQObject *tqparent=0, const char *name=0);
+		WidgetFactory(TQObject *parent=0, const char *name=0);
 		virtual ~WidgetFactory();
 
 		/*! Adds a new class described by \a w. */
@@ -289,12 +289,12 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 * Creates a widget (and if needed a KFormDesigner::Container)
 		 * \return the created widget
 		 * \param classname the classname of the widget, which should get created
-		 * \param tqparent the tqparent for the created widget
+		 * \param parent the parent for the created widget
 		 * \param name the name of the created widget
 		 * \param container the toplevel Container (if a container should get created)
 		 * \param options options for the created widget: orientation and view mode (see CreateWidgetOptions)
 		 */
-		virtual TQWidget* createWidget(const TQCString &classname, TQWidget *tqparent, const char *name,
+		virtual TQWidget* createWidget(const TQCString &classname, TQWidget *parent, const char *name,
 			KFormDesigner::Container *container, 
 			int options = DefaultOptions) = 0;
 
@@ -310,7 +310,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		/*! Creates (if necessary) an editor to edit the contents of the widget directly in the Form
 		   (eg creates a line edit to change the text of a label). \a classname is
 		   the class the widget belongs to, \a w is the widget to edit
-		   and \a container is the tqparent container of this widget (to access Form etc.).
+		   and \a container is the parent container of this widget (to access Form etc.).
 		 */
 		virtual bool startEditing(const TQCString &classname, TQWidget *w, Container *container)=0;
 
@@ -327,7 +327,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 */
 		virtual bool saveSpecialProperty(const TQCString &classname, const TQString &name,
 			const TQVariant &value, TQWidget *w,
-			TQDomElement &parentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &parent);
 
 		/*! This function is called when FormIO finds a property or an unknown
 		element in a .ui file. You can this way load a special property, for
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index 3d8607baa..c9f9bd9bd 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -43,8 +43,8 @@ namespace KFormDesigner {
 class XMLGUIClient : public TQObject, public KXMLGUIClient
 {
 	public:
-		XMLGUIClient(KXMLGUIClient* tqparent, const TQString& xmlFileName)
-		 : TQObject(tqparent->actionCollection()), KXMLGUIClient(tqparent)
+		XMLGUIClient(KXMLGUIClient* parent, const TQString& xmlFileName)
+		 : TQObject(parent->actionCollection()), KXMLGUIClient(parent)
 		{
 			setXMLFile( xmlFileName, true /*merge*/ );
 		}
@@ -107,8 +107,8 @@ using namespace KFormDesigner;
 
 //-------------------------------------------
 
-WidgetLibrary::WidgetLibrary(TQObject *tqparent, const TQStringList& supportedFactoryGroups)
- : TQObject(tqparent)
+WidgetLibrary::WidgetLibrary(TQObject *parent, const TQStringList& supportedFactoryGroups)
+ : TQObject(parent)
  , d(new WidgetLibraryPrivate())
 {
 	for (TQStringList::ConstIterator it = supportedFactoryGroups.constBegin();
@@ -138,7 +138,7 @@ WidgetLibrary::loadFactoryWidgets(WidgetFactory *f)
 			WidgetFactory *parentFactory = d->factories[w->m_parentFactoryName];
 			if (!parentFactory) {
 				kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->className()
-					<< "' - no such tqparent factory '" << w->m_parentFactoryName << "'" << endl;
+					<< "' - no such parent factory '" << w->m_parentFactoryName << "'" << endl;
 				continue;
 			}
 			WidgetInfo* inheritedClass = parentFactory->m_classesByName[ w->m_inheritedClassName ];
@@ -319,7 +319,7 @@ WidgetLibrary::createXML()
 }*/
 
 ActionList
-WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *tqparent, 
+WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, 
 	TQObject *receiver, const char *slot)
 {
 	loadFactories();
@@ -340,7 +340,7 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *tqp
 	{
 		LibActionWidget *a = new LibActionWidget(it.current(), 
 			it.current()->factory()->m_guiClient 
-			? it.current()->factory()->m_guiClient->actionCollection() : tqparent);
+			? it.current()->factory()->m_guiClient->actionCollection() : parent);
 		connect(a, TQT_SIGNAL(prepareInsert(const TQCString &)), receiver, slot);
 		actions.append(a);
 	}
@@ -359,7 +359,7 @@ WidgetLibrary::addCustomWidgetActions(KActionCollection *col)
 }
 
 TQWidget*
-WidgetLibrary::createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, Container *c,
+WidgetLibrary::createWidget(const TQCString &classname, TQWidget *parent, const char *name, Container *c,
 	int options)
 {
 	loadFactories();
@@ -367,12 +367,12 @@ WidgetLibrary::createWidget(const TQCString &classname, TQWidget *tqparent, cons
 	if(!wclass)
 		return 0;
 
-	TQWidget *widget = wclass->factory()->createWidget(wclass->className(), tqparent, name, c, options);
+	TQWidget *widget = wclass->factory()->createWidget(wclass->className(), parent, name, c, options);
 	if (!widget) {
 		//try to instantiate from inherited class
 		if (wclass->inheritedClass())
 			widget = wclass->inheritedClass()->factory()->createWidget(
-				wclass->className(), tqparent, name, c, options);
+				wclass->className(), parent, name, c, options);
 		if (!widget)
 			return 0;
 	}
@@ -536,18 +536,18 @@ WidgetLibrary::iconName(const TQCString &classname)
 }
 
 bool
-WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
+WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent)
 {
 	loadFactories();
 	WidgetInfo *wi = d->widgets.find(classname);
 	if (!wi)
 		return false;
 
-	if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, tqparent))
+	if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, parent))
 		return true;
 	//try from inherited class
 	if (wi->inheritedClass())
-		return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, tqparent);
+		return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, parent);
 	return false;
 }
 
@@ -648,7 +648,7 @@ TQString WidgetLibrary::propertyDescForName(WidgetInfo *winfo, const TQCString&
 	if (winfo->m_parentFactoryName.isEmpty())
 		return TQString();
 
-	//try in tqparent factory, if exists
+	//try in parent factory, if exists
 	WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName];
 	if (!parentFactory)
 		return TQString();
@@ -666,7 +666,7 @@ TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString&
 	if (winfo->m_parentFactoryName.isEmpty())
 		return TQString();
 
-	//try in tqparent factory, if exists
+	//try in parent factory, if exists
 	WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName];
 	if (!parentFactory)
 		return TQString();
@@ -705,7 +705,7 @@ TQString WidgetLibrary::internalProperty(const TQCString& classname, const TQCSt
 }
 
 WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup(
-	const TQCString &classname, TQWidget* tqparent, const TQPoint& pos)
+	const TQCString &classname, TQWidget* parent, const TQPoint& pos)
 {
 	loadFactories();
 	WidgetInfo *wclass = d->widgets[classname];
@@ -738,7 +738,7 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup(
 	if (textVertical.isEmpty()) //default
 		textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical");
 
-	KPopupMenu* popup = new KPopupMenu(tqparent, "orientationSelectionPopup");
+	KPopupMenu* popup = new KPopupMenu(parent, "orientationSelectionPopup");
 	popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").tqarg(wclass->name()));
 	popup->insertItem(iconHorizontal, textHorizontal, 1);
 	popup->insertItem(iconVertical, textVertical, 2);
diff --git a/kexi/formeditor/widgetlibrary.h b/kexi/formeditor/widgetlibrary.h
index 22d4c05f0..1c4a77a00 100644
--- a/kexi/formeditor/widgetlibrary.h
+++ b/kexi/formeditor/widgetlibrary.h
@@ -66,14 +66,14 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		 By default (when supportedFactoryGroups is empty) only factories having empty
 		 "X-KFormDesigner-FactoryGroup" field will be loaded.
 		 Factory group names are case-insensitive. */
-		WidgetLibrary(TQObject *tqparent=0, const TQStringList& supportedFactoryGroups = TQStringList());
+		WidgetLibrary(TQObject *parent=0, const TQStringList& supportedFactoryGroups = TQStringList());
 
 		virtual ~WidgetLibrary();
 
 		/**
 		 * creates actions for widget creating
 		 */
-		ActionList createWidgetActions(KXMLGUIClient* client, KActionCollection *tqparent, 
+		ActionList createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, 
 			TQObject *receiver, const char *slot);
 
 		void addCustomWidgetActions(KActionCollection *col);
@@ -87,7 +87,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		 * searches the right factory and creates a widget.
 		 * \return the widget or 0 if something falid
 		 */
-		TQWidget *createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, Container *c,
+		TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, Container *c,
 			int options = WidgetFactory::DefaultOptions);
 
 		bool createMenuActions(const TQCString &c, TQWidget *w, TQPopupMenu *menu,
@@ -101,7 +101,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		 * - WidgetFactory::VerticalQt::Orientation
 		 */
 		WidgetFactory::CreateWidgetOptions showOrientationSelectionPopup(
-			const TQCString &classname, TQWidget* tqparent, const TQPoint& pos);
+			const TQCString &classname, TQWidget* parent, const TQPoint& pos);
 
 		TQString internalProperty(const TQCString& classname, const TQCString& property);
 
@@ -122,7 +122,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		bool clearWidgetContent(const TQCString &classname, TQWidget *w);
 
 		bool saveSpecialProperty(const TQCString &classname, const TQString &name,
-			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent);
 		bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			ObjectTreeItem *item);
 		bool isPropertyVisible(const TQCString &classname, TQWidget *w,
@@ -149,7 +149,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		 for a class described by \a winfo. The name can be displayed in
 		 PropertyEditor. The name is retrieved from class' widget library.
 		 If this library doesn't define description for such property,
-		 and there is a tqparent library for \a winfo defined, tqparent library
+		 and there is a parent library for \a winfo defined, parent library
 		 is asked for returning description string.
 		 Eventually, if even this failed, empty string is returned.
 		 @see WidgetFactory::propertyDescForName() */
@@ -157,7 +157,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 
 		/*! \return The i18n'ed name of the property's value whose name is \a name.
 		 Works in the same way as propertyDescForName(): if actual library
-		 does not define a description we are looking for, tqparent factory is asked
+		 does not define a description we are looking for, parent factory is asked
 		 to return such description.
 		 Eventually, if even this failed, empty string is returned.
 		 @see WidgetFactory::propertyDescForValue() */
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index bd150e45f..d06a5c2e9 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -88,8 +88,8 @@ class WidgetPropertySetPrivate
 };
 }
 
-WidgetPropertySet::WidgetPropertySet(TQObject *tqparent)
- : TQObject(tqparent, "kfd_widgetPropertySet")
+WidgetPropertySet::WidgetPropertySet(TQObject *parent)
+ : TQObject(parent, "kfd_widgetPropertySet")
 {
 	d = new WidgetPropertySetPrivate();
 //	d->manager = manager;
@@ -1086,7 +1086,7 @@ WidgetPropertySet::createValueList(WidgetInfo *winfo, const TQStringList &list)
 	TQStringList::ConstIterator endIt = list.end();
 	for(TQStringList::ConstIterator it = list.begin(); it != endIt; ++it) {
 		TQString n( d->propValCaption[ (*it).latin1() ] );
-		if (n.isEmpty()) { //try within factory and (maybe) tqparent factory
+		if (n.isEmpty()) { //try within factory and (maybe) parent factory
 			if (winfo)
 				n = KFormDesigner::FormManager::self()->activeForm()->library()->propertyDescForValue( winfo, (*it).latin1() );
 			if (n.isEmpty())
diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h
index cc403ef0f..afb303d1a 100644
--- a/kexi/formeditor/widgetpropertyset.h
+++ b/kexi/formeditor/widgetpropertyset.h
@@ -44,7 +44,7 @@ class KFORMEDITOR_EXPORT WidgetPropertySet : public TQObject
   TQ_OBJECT
 
 	public:
-		WidgetPropertySet(TQObject *tqparent);
+		WidgetPropertySet(TQObject *parent);
 		~WidgetPropertySet();
 
 //		FormManager* manager();
diff --git a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
index 0bbb958c0..aa84f8313 100644
--- a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
+++ b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
@@ -40,7 +40,7 @@ void WidgetWithSubpropertiesInterface::setSubwidget(TQWidget *widget)
 	m_subproperies.clear();
 	TQAsciiDict<char> addedSubproperies(1024);
 	if (m_subwidget) {
-		//remember properties in the subwidget that are not present in the tqparent
+		//remember properties in the subwidget that are not present in the parent
 		for( TQMetaObject *tqmetaObject = m_subwidget->tqmetaObject(); tqmetaObject; tqmetaObject = tqmetaObject->tqsuperClass()) {
 			const int numProperties = tqmetaObject->numProperties();
 			for (int i = 0; i < numProperties; i++) {
diff --git a/kexi/formeditor/widgetwithsubpropertiesinterface.h b/kexi/formeditor/widgetwithsubpropertiesinterface.h
index b0d86710c..dd6b0ddcb 100644
--- a/kexi/formeditor/widgetwithsubpropertiesinterface.h
+++ b/kexi/formeditor/widgetwithsubpropertiesinterface.h
@@ -32,7 +32,7 @@ namespace KFormDesigner {
 /*! Currently used in KexiDBAutoField to allow editing specific properties 
  of its internal editor. For example, if the autofield is of type Image Box,
  the Image Box widget has some specific properties like "lineWidth". 
- Such properties are provided by the tqparent KexiDBAutoField object as subproperties. */
+ Such properties are provided by the parent KexiDBAutoField object as subproperties. */
 class KFORMEDITOR_EXPORT WidgetWithSubpropertiesInterface
 {
 	public:
diff --git a/kexi/kexidb/dbobjectnamevalidator.cpp b/kexi/kexidb/dbobjectnamevalidator.cpp
index b7a2f633e..1edf5a258 100644
--- a/kexi/kexidb/dbobjectnamevalidator.cpp
+++ b/kexi/kexidb/dbobjectnamevalidator.cpp
@@ -25,8 +25,8 @@ using namespace KexiDB;
 using namespace KexiUtils;
 
 ObjectNameValidator::ObjectNameValidator(
-	KexiDB::Driver *drv, TQObject * tqparent, const char * name)
-: Validator(tqparent,name)
+	KexiDB::Driver *drv, TQObject * parent, const char * name)
+: Validator(parent,name)
 {
 	m_drv = drv;
 }
diff --git a/kexi/kexidb/dbobjectnamevalidator.h b/kexi/kexidb/dbobjectnamevalidator.h
index 2b9a0645a..ad2db4bda 100644
--- a/kexi/kexidb/dbobjectnamevalidator.h
+++ b/kexi/kexidb/dbobjectnamevalidator.h
@@ -36,7 +36,7 @@ namespace KexiDB {
 			/*! \a drv is a KexiDB driver on which isSystemObjectName() will be 
 			 called inside check(). If \a drv is 0, KexiDB::Driver::isKexiDBSystemObjectName()
 			 static function is called instead. */
-			ObjectNameValidator(KexiDB::Driver *drv, TQObject * tqparent = 0, const char * name = 0);
+			ObjectNameValidator(KexiDB::Driver *drv, TQObject * parent = 0, const char * name = 0);
 			virtual ~ObjectNameValidator();
 
 		protected:
diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp
index da77ab72c..4db1b4001 100644
--- a/kexi/kexidb/driver.cpp
+++ b/kexi/kexidb/driver.cpp
@@ -69,8 +69,8 @@ Driver::Info::Info()
 
 //---------------------------------------------
 
-Driver::Driver( TQObject *tqparent, const char *name, const TQStringList & )
-	: TQObject( tqparent, name )
+Driver::Driver( TQObject *parent, const char *name, const TQStringList & )
+	: TQObject( parent, name )
 	, Object()
 	, beh( new DriverBehaviour() )
 	, d( new DriverPrivate() )
diff --git a/kexi/kexidb/driver.h b/kexi/kexidb/driver.h
index 7a8d51656..3c69a6871 100644
--- a/kexi/kexidb/driver.h
+++ b/kexi/kexidb/driver.h
@@ -43,7 +43,7 @@ class DriverPrivate;
 //! Generic database abstraction.
 /*! This class is a prototype of the database driver for implementations.
  Driver allows new connections to be created, and groups
- these as a tqparent. 
+ these as a parent. 
  Before destruction, all connections are destructed.
 
  Notes:
@@ -305,7 +305,7 @@ class KEXI_DB_EXPORT Driver : public TQObject, public KexiDB::Object
 		 You may also want to change options in DriverBehaviour *beh member.
 		 See drivers/mySQL/mysqldriver.cpp for usage example.
 		 */
-		Driver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() );
+		Driver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() );
 
 		/*! For reimplemenation: creates and returns connection object 
 		 with additional structures specific for a given driver.
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
index 4d7db1602..01d326af2 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
@@ -54,7 +54,7 @@ KEXIDB_DRIVER_INFO( MySqlDriver, mysql )
  *
  * See: http://dev.mysql.com/doc/mysql/en/Column_types.html
  */
-MySqlDriver::MySqlDriver(TQObject *tqparent, const char *name, const TQStringList &args) : Driver(tqparent, name,args)
+MySqlDriver::MySqlDriver(TQObject *parent, const char *name, const TQStringList &args) : Driver(parent, name,args)
 {
 //	KexiDBDrvDbg << "MySqlDriver::MySqlDriver()" << endl;
 
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.h b/kexi/kexidb/drivers/mySQL/mysqldriver.h
index 7e6d5a352..df02441c1 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.h
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.h
@@ -34,7 +34,7 @@ class MySqlDriver : public Driver
 	KEXIDB_DRIVER
 
 	public:
-		MySqlDriver(TQObject *tqparent, const char *name, const TQStringList &args=TQStringList());
+		MySqlDriver(TQObject *parent, const char *name, const TQStringList &args=TQStringList());
 		virtual ~MySqlDriver();
 		
 		virtual bool isSystemDatabaseName( const TQString &n ) const;
diff --git a/kexi/kexidb/drivers/odbc/odbcdriver.cpp b/kexi/kexidb/drivers/odbc/odbcdriver.cpp
index 38e0796e1..83d463616 100644
--- a/kexi/kexidb/drivers/odbc/odbcdriver.cpp
+++ b/kexi/kexidb/drivers/odbc/odbcdriver.cpp
@@ -39,8 +39,8 @@ using namespace KexiDB;
 
 KEXIDB_DRIVER_INFO( ODBCDriver, odbc )
 
-ODBCDriver::ODBCDriver( TQObject *tqparent, const char *name, const TQStringList &args )
-	: Driver( tqparent, name, args )
+ODBCDriver::ODBCDriver( TQObject *parent, const char *name, const TQStringList &args )
+	: Driver( parent, name, args )
 {
 	d->isFileDriver = false;
 	d->isDBOpenedAfterCreate = true;
diff --git a/kexi/kexidb/drivers/odbc/odbcdriver.h b/kexi/kexidb/drivers/odbc/odbcdriver.h
index c26af43f5..a5e7ee68c 100644
--- a/kexi/kexidb/drivers/odbc/odbcdriver.h
+++ b/kexi/kexidb/drivers/odbc/odbcdriver.h
@@ -45,7 +45,7 @@ class ODBCDriver : public Driver
 	KEXIDB_DRIVER
 
 	public:
-		ODBCDriver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() );
+		ODBCDriver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() );
 		~ODBCDriver();
 
 		virtual bool isSystemDatabaseName( const TQString& name ) const;
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
index ce66a6e8e..333df590c 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
@@ -33,8 +33,8 @@ KEXIDB_DRIVER_INFO( pqxxSqlDriver, pqxxsql )
 
 //==================================================================================
 //
-pqxxSqlDriver::pqxxSqlDriver( TQObject *tqparent, const char *name, const TQStringList &args )
-	: Driver( tqparent, name, args )
+pqxxSqlDriver::pqxxSqlDriver( TQObject *parent, const char *name, const TQStringList &args )
+	: Driver( parent, name, args )
 {
 	d->isFileDriver = false;
 	d->features = SingleTransactions | CursorForward | CursorBackward;
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.h b/kexi/kexidb/drivers/pqxx/pqxxdriver.h
index 779c13686..8ea7b1fad 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.h
@@ -38,7 +38,7 @@ class pqxxSqlDriver : public Driver
 	KEXIDB_DRIVER
 
 	public:
-		pqxxSqlDriver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() );
+		pqxxSqlDriver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() );
 		~pqxxSqlDriver();
 
 		virtual bool isSystemObjectName( const TQString& n )const;
diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
index 80276682b..fc3565583 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
@@ -48,9 +48,9 @@ class KexiDB::SQLiteDriverPrivate
 		}
 };
 
-//PgSqlDB::PgSqlDB(TQObject *tqparent, const char *name, const TQStringList &) 
-SQLiteDriver::SQLiteDriver( TQObject *tqparent, const char *name, const TQStringList &args )
-	: Driver( tqparent, name, args )
+//PgSqlDB::PgSqlDB(TQObject *parent, const char *name, const TQStringList &) 
+SQLiteDriver::SQLiteDriver( TQObject *parent, const char *name, const TQStringList &args )
+	: Driver( parent, name, args )
 	,dp( new SQLiteDriverPrivate() )
 {
 	d->isFileDriver = true;
diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.h b/kexi/kexidb/drivers/sqlite/sqlitedriver.h
index a388d823a..59fe89aff 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitedriver.h
+++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.h
@@ -39,7 +39,7 @@ class SQLiteDriver : public Driver
 	KEXIDB_DRIVER
 
 	public:
-		SQLiteDriver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() );
+		SQLiteDriver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() );
 		virtual ~SQLiteDriver();
 
 		/*! \return true if \a n is a system object name; 
diff --git a/kexi/kexidb/expression.h b/kexi/kexidb/expression.h
index ee2c98100..67c1c07e0 100644
--- a/kexi/kexidb/expression.h
+++ b/kexi/kexidb/expression.h
@@ -80,7 +80,7 @@ public:
 	
 	virtual Field::Type type();
 	
-	BaseExpr* tqparent() const { return m_par; }
+	BaseExpr* parent() const { return m_par; }
 	
 	virtual void setParent(BaseExpr *p) { m_par = p; }
 	
@@ -121,7 +121,7 @@ public:
 
 protected:
 	int m_cl; //!< class
-	BaseExpr *m_par; //!< tqparent expression
+	BaseExpr *m_par; //!< parent expression
 	int m_token;
 };
 
@@ -224,7 +224,7 @@ public:
 	virtual QueryParameterExpr* copy() const;
 	virtual Field::Type type();
 	/*! Sets expected type of the parameter. The default is String.
-	 This method is called from tqparent's expression validate().
+	 This method is called from parent's expression validate().
 	 This depends on the type of the related expression.
 	 For instance: query "SELECT * FROM cars WHERE name=[enter name]",
 	 "[enter name]" has parameter of the same type as "name" field.
diff --git a/kexi/kexidb/field.h b/kexi/kexidb/field.h
index 9e0c94808..a99e845ed 100644
--- a/kexi/kexidb/field.h
+++ b/kexi/kexidb/field.h
@@ -57,8 +57,8 @@ class BaseExpr;
  Note that aliases for fields are defined within query, not in Field object, 
  because the same field can be used in different queries with different alias.
 
- Notes for advanced use: Field obeject is designed to be owned by a tqparent object. 
- Such a tqparent object can be KexiDB::TableSchema, if the field defines single table column,
+ Notes for advanced use: Field obeject is designed to be owned by a parent object. 
+ Such a parent object can be KexiDB::TableSchema, if the field defines single table column,
  or KexiDB::QuerySchema, if the field defines an expression (KexiDB::BaseExpr class).
 
  Using expression class for fields allos to define expressions within queries like
diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h
index 439a5cc12..fbf303a9a 100644
--- a/kexi/kexidb/fieldlist.h
+++ b/kexi/kexidb/fieldlist.h
@@ -109,7 +109,7 @@ class KEXI_DB_EXPORT FieldList
 
 		/*! Creates and returns a list that contain fields selected by name.
 		 At least one field (exising on this list) should be selected, otherwise 0 is
-		 returned. Returned FieldList object is not owned by any tqparent (so you need 
+		 returned. Returned FieldList object is not owned by any parent (so you need 
 		 to destroy yourself) and Field objects included in it are not owned by it 
 		 (but still as before, by 'this' object).
 		 Returned list can be usable e.g. as argument for Connection::insertRecord().
diff --git a/kexi/kexidb/fieldvalidator.cpp b/kexi/kexidb/fieldvalidator.cpp
index d9252c206..57f8bd8d4 100644
--- a/kexi/kexidb/fieldvalidator.cpp
+++ b/kexi/kexidb/fieldvalidator.cpp
@@ -26,12 +26,12 @@
 
 using namespace KexiDB;
 
-FieldValidator::FieldValidator( const Field &field, TQWidget * tqparent, const char * name )
- : KexiUtils::MultiValidator(TQT_TQOBJECT(tqparent), name)
+FieldValidator::FieldValidator( const Field &field, TQWidget * parent, const char * name )
+ : KexiUtils::MultiValidator(TQT_TQOBJECT(parent), name)
 {
 //! @todo merge this code with KexiTableEdit code!
 //! @todo set maximum length validator
-//! @todo handle input tqmask (via TQLineEdit::setInputMask()
+//! @todo handle input mask (via TQLineEdit::setInputMask()
 	const Field::Type t = field.type();
 	if (field.isIntegerType()) {
 		TQValidator *validator = 0;
diff --git a/kexi/kexidb/fieldvalidator.h b/kexi/kexidb/fieldvalidator.h
index 7b0e2bf81..038a91009 100644
--- a/kexi/kexidb/fieldvalidator.h
+++ b/kexi/kexidb/fieldvalidator.h
@@ -40,7 +40,7 @@ class KEXI_DB_EXPORT FieldValidator : public KexiUtils::MultiValidator
 {
 	public:
 		//! Setups the validator for \a field. Does not keep a pointer to \a field.
-		FieldValidator( const Field &field, TQWidget * tqparent, const char * name = 0 );
+		FieldValidator( const Field &field, TQWidget * parent, const char * name = 0 );
 		~FieldValidator();
 };
 
diff --git a/kexi/kexidb/indexschema.h b/kexi/kexidb/indexschema.h
index 12feae04f..54306af24 100644
--- a/kexi/kexidb/indexschema.h
+++ b/kexi/kexidb/indexschema.h
@@ -110,7 +110,7 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData
 		 is this IndexSchem object assigned.
 
 		 Note: If \a rel was detached from masterRelationships() list, 
-		 this object now has no tqparent, so you need to attach it to somewhere or destruct it. 
+		 this object now has no parent, so you need to attach it to somewhere or destruct it. 
 		*/
 		void detachRelationship(Relationship *rel);
 
diff --git a/kexi/kexidb/msghandler.cpp b/kexi/kexidb/msghandler.cpp
index f2946a2b8..e72b33e3f 100644
--- a/kexi/kexidb/msghandler.cpp
+++ b/kexi/kexidb/msghandler.cpp
@@ -35,8 +35,8 @@ MessageTitle::~MessageTitle()
 
 //------------------------------------------------
 
-MessageHandler::MessageHandler(TQWidget *tqparent)
- : m_messageHandlerParentWidget(tqparent)
+MessageHandler::MessageHandler(TQWidget *parent)
+ : m_messageHandlerParentWidget(parent)
  , m_enableMessages(true)
 {
 }
diff --git a/kexi/kexidb/msghandler.h b/kexi/kexidb/msghandler.h
index c0c8c494d..e4fc66440 100644
--- a/kexi/kexidb/msghandler.h
+++ b/kexi/kexidb/msghandler.h
@@ -54,9 +54,9 @@ class KEXI_DB_EXPORT MessageHandler
 	public:
 		enum MessageType { Error, Sorry, Warning };
 
-		/*! Constructs mesage handler, \a tqparent is a widget that will be a tqparent 
+		/*! Constructs mesage handler, \a parent is a widget that will be a parent 
 		 for displaying gui elements (e.g. message boxes). Can be 0 for non-gui usage. */
-		MessageHandler(TQWidget *tqparent = 0);
+		MessageHandler(TQWidget *parent = 0);
 		virtual ~MessageHandler();
 
 		/*! This method can be used to block/unblock messages.
diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp
index 7ed1a47bb..c2cece0bc 100644
--- a/kexi/kexidb/parser/parser_p.cpp
+++ b/kexi/kexidb/parser/parser_p.cpp
@@ -485,7 +485,7 @@ QuerySchema* buildSelectQuery(
 		}
 	}
 
-	/* set tqparent table if there's only one */
+	/* set parent table if there's only one */
 //	if (parser->select()->tables()->count()==1)
 	if (querySchema->tables()->count()==1)
 		querySchema->setMasterTable(querySchema->tables()->first());
diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index d3d1361c0..9fa9ca018 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -382,10 +382,10 @@ void ConnectionTestThread::run()
 	m_dlg->error(0);
 }
 
-ConnectionTestDialog::ConnectionTestDialog(TQWidget* tqparent, 
+ConnectionTestDialog::ConnectionTestDialog(TQWidget* parent, 
 	const KexiDB::ConnectionData& data,
 	KexiDB::MessageHandler& msgHandler)
- : KProgressDialog(tqparent, "testconn_dlg",
+ : KProgressDialog(parent, "testconn_dlg",
 	i18n("Test Connection"), i18n("<qt>Testing connection to <b>%1</b> database server...</qt>")
 	.tqarg(data.serverInfoString(true)), true /*modal*/)
  , m_thread(new ConnectionTestThread(this, data))
@@ -483,10 +483,10 @@ void ConnectionTestDialog::slotCancel()
 	KProgressDialog::slotCancel();
 }
 
-void KexiDB::connectionTestDialog(TQWidget* tqparent, const KexiDB::ConnectionData& data, 
+void KexiDB::connectionTestDialog(TQWidget* parent, const KexiDB::ConnectionData& data, 
 	KexiDB::MessageHandler& msgHandler)
 {
-	ConnectionTestDialog dlg(tqparent, data, msgHandler);
+	ConnectionTestDialog dlg(parent, data, msgHandler);
 	dlg.exec();
 }
 
diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h
index b8ee03b5b..ec807d340 100644
--- a/kexi/kexidb/utils.h
+++ b/kexi/kexidb/utils.h
@@ -259,7 +259,7 @@ namespace KexiDB
 	 (within a second thread).
 	 \a data is used to perform a (temporary) test connection. \a msgHandler is used to display errors.
 	 On successful connecting, a message is displayed. After testing, temporary connection is closed. */
-	KEXI_DB_EXPORT void connectionTestDialog(TQWidget* tqparent, const ConnectionData& data, 
+	KEXI_DB_EXPORT void connectionTestDialog(TQWidget* parent, const ConnectionData& data, 
 		MessageHandler& msgHandler);
 
 	/*! Saves connection data \a data into \a map. */
@@ -349,7 +349,7 @@ namespace KexiDB
 	/*! Convenience version of loadPropertyValueFromDom(). \return TQString value. */
 	KEXI_DB_EXPORT TQString loadStringPropertyValueFromDom( const TQDomNode& node, bool* ok );
 
-	/*! Saves integer element for value \a value to \a doc document within tqparent element
+	/*! Saves integer element for value \a value to \a doc document within parent element
 	 \a parentEl. The value will be enclosed in "number" element and "elementName" element.
 	 Example: saveNumberElementToDom(doc, parentEl, "height", 15) will create 
 	 \code
@@ -359,7 +359,7 @@ namespace KexiDB
 	KEXI_DB_EXPORT TQDomElement saveNumberElementToDom(TQDomDocument& doc, TQDomElement& parentEl, 
 		const TQString& elementName, int value);
 
-	/*! Saves boolean element for value \a value to \a doc document within tqparent element
+	/*! Saves boolean element for value \a value to \a doc document within parent element
 	 \a parentEl. Like saveNumberElementToDom() but creates "bool" tags. True/false values will be
 	 saved as "true"/"false" strings. 
 	 \return the reference to element created with tag elementName. */
diff --git a/kexi/kexidb/utils_p.h b/kexi/kexidb/utils_p.h
index 56c20267e..8f10fb5b9 100644
--- a/kexi/kexidb/utils_p.h
+++ b/kexi/kexidb/utils_p.h
@@ -34,7 +34,7 @@ class ConnectionTestDialog : protected KProgressDialog
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		ConnectionTestDialog(TQWidget* tqparent, 
+		ConnectionTestDialog(TQWidget* parent, 
 			const KexiDB::ConnectionData& data, KexiDB::MessageHandler& msgHandler);
 		virtual ~ConnectionTestDialog();
 
diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp
index f0a5146c5..cbee692d5 100644
--- a/kexi/kexiutils/debuggui.cpp
+++ b/kexi/kexiutils/debuggui.cpp
@@ -37,10 +37,10 @@ static KTabWidget* debugWindowTab = 0;
 static KListView* kexiDBDebugPage = 0;
 static KListView* kexiAlterTableActionDebugPage = 0;
 
-TQWidget *KexiUtils::createDebugWindow(TQWidget *tqparent)
+TQWidget *KexiUtils::createDebugWindow(TQWidget *parent)
 {
 	// (this is internal code - do not use i18n() here)
-	debugWindow = new DebugWindowDialog(tqparent);
+	debugWindow = new DebugWindowDialog(parent);
 	debugWindow->setSizeGripEnabled( true );
 	TQBoxLayout *lyr = new TQVBoxLayout(debugWindow, KDialogBase::marginHint());
 	debugWindowTab = new KTabWidget(debugWindow, "debugWindowTab");
@@ -127,7 +127,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel)
 	TQListViewItem * lastItem = kexiAlterTableActionDebugPage->lastItem();
 	//kdDebug() << "lastItem: " << (lastItem ? lastItem->text(0) : TQString()) << endl;
 	while (lastItem) {
-		lastItem = lastItem->tqparent();
+		lastItem = lastItem->parent();
 		availableNestingLevels++;
 	}
 	//kdDebug() << "availableNestingLevels: " << availableNestingLevels << endl;
@@ -135,7 +135,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel)
 	lastItem = kexiAlterTableActionDebugPage->lastItem();
 	int levelsToGoUp = availableNestingLevels - nestingLevel;
 	while (levelsToGoUp > 0 && lastItem) {
-		lastItem = lastItem->tqparent();
+		lastItem = lastItem->parent();
 		levelsToGoUp--;
 	}
 	//kdDebug() << "lastItem2: " << (lastItem ? lastItem->text(0) : TQString()) << endl;
@@ -150,8 +150,8 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel)
 	}
 	else {
 		lastItem = kexiAlterTableActionDebugPage->lastItem();
-		while (lastItem && lastItem->tqparent())
-			lastItem = lastItem->tqparent();
+		while (lastItem && lastItem->parent())
+			lastItem = lastItem->parent();
 		//kdDebug() << "lastItem2: " << (lastItem ? lastItem->text(0) : TQString()) << endl;
 		li = new KListViewItem( kexiAlterTableActionDebugPage, lastItem, text ); //after
 	}
diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp
index 46e62b7b3..da5f7f964 100644
--- a/kexi/kexiutils/identifier.cpp
+++ b/kexi/kexiutils/identifier.cpp
@@ -93,8 +93,8 @@ TQString KexiUtils::identifierExpectedMessage(const TQString &valueName, const T
 
 //--------------------------------------------------------------------------------
 
-IdentifierValidator::IdentifierValidator(TQObject * tqparent, const char * name)
-: Validator(tqparent,name)
+IdentifierValidator::IdentifierValidator(TQObject * parent, const char * name)
+: Validator(parent,name)
 {
 }
 
diff --git a/kexi/kexiutils/identifier.h b/kexi/kexiutils/identifier.h
index 2987019b4..e8f6a2940 100644
--- a/kexi/kexiutils/identifier.h
+++ b/kexi/kexiutils/identifier.h
@@ -48,7 +48,7 @@ namespace KexiUtils {
 	class KEXIUTILS_EXPORT IdentifierValidator : public Validator
 	{
 		public:
-			IdentifierValidator(TQObject * tqparent = 0, const char * name = 0);
+			IdentifierValidator(TQObject * parent = 0, const char * name = 0);
 			virtual ~IdentifierValidator();
 			virtual State validate( TQString & input, int & pos) const;
 
diff --git a/kexi/kexiutils/longlongvalidator.cpp b/kexi/kexiutils/longlongvalidator.cpp
index 7d985c321..ca3a42dd8 100644
--- a/kexi/kexiutils/longlongvalidator.cpp
+++ b/kexi/kexiutils/longlongvalidator.cpp
@@ -25,15 +25,15 @@
 
 using namespace KexiUtils;
 
-LongLongValidator::LongLongValidator( TQWidget * tqparent, int base, const char * name )
- : TQValidator(TQT_TQOBJECT(tqparent), name)
+LongLongValidator::LongLongValidator( TQWidget * parent, int base, const char * name )
+ : TQValidator(TQT_TQOBJECT(parent), name)
  , m_min(0), m_max(0)
 {
 	setBase(base);
 }
 
-LongLongValidator::LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * tqparent, int base, const char * name )
-  : TQValidator(TQT_TQOBJECT(tqparent), name)
+LongLongValidator::LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * parent, int base, const char * name )
+  : TQValidator(TQT_TQOBJECT(parent), name)
 {
 	setBase(base);
 	setRange( bottom, top );
diff --git a/kexi/kexiutils/longlongvalidator.h b/kexi/kexiutils/longlongvalidator.h
index bd211feb7..e1853eec7 100644
--- a/kexi/kexiutils/longlongvalidator.h
+++ b/kexi/kexiutils/longlongvalidator.h
@@ -38,8 +38,8 @@ namespace KexiUtils {
 class KEXIUTILS_EXPORT LongLongValidator : public TQValidator
 {
 	public:
-		LongLongValidator( TQWidget * tqparent, int base = 10, const char * name = 0 );
-		LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * tqparent, int base = 10, const char * name = 0 );
+		LongLongValidator( TQWidget * parent, int base = 10, const char * name = 0 );
+		LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * parent, int base = 10, const char * name = 0 );
 		virtual ~LongLongValidator();
 
 		//! Validates the text, and returns the result.  Does not modify the parameters.
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index 118f2d647..d7bdbae84 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -30,23 +30,23 @@ class TQColor;
 //! @short General Utils
 namespace KexiUtils
 {
-	//! \return true if \a o has tqparent \a par.
+	//! \return true if \a o has parent \a par.
 	inline bool hasParent(TQObject* par, TQObject* o)
 	{
 		if (!o || !par)
 			return false;
 		while (o && o!=par)
-			o = o->tqparent();
+			o = o->parent();
 		return o==par;
 	}
 
-	//! \return tqparent object of \a o that inherits \a className or NULL if no such tqparent
+	//! \return parent object of \a o that inherits \a className or NULL if no such parent
 	template<class type>
 	inline type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className)
 	{
 		if (!o || !className || className[0]=='\0')
 			return 0;
-		while ( ((o=TQT_TQOBJECT(o)->tqparent())) && !TQT_TQOBJECT(o)->inherits(className) )
+		while ( ((o=TQT_TQOBJECT(o)->parent())) && !TQT_TQOBJECT(o)->inherits(className) )
 			;
 		return static_cast<type*>(o);
 	}
@@ -58,7 +58,7 @@ namespace KexiUtils
 		const TQObject * obj = o;
 		if (!obj || !className || className[0]=='\0')
 			return 0;
-		while ( ((obj=obj->tqparent())) && !obj->inherits(className) )
+		while ( ((obj=obj->parent())) && !obj->inherits(className) )
 			;
 		return static_cast<const type*>(obj);
 	}
@@ -195,7 +195,7 @@ namespace KexiUtils
 
 #ifdef KEXI_DEBUG_GUI
 	//! Creates debug window for convenient debugging output
-	KEXIUTILS_EXPORT TQWidget *createDebugWindow(TQWidget *tqparent);
+	KEXIUTILS_EXPORT TQWidget *createDebugWindow(TQWidget *parent);
 
 	//! Adds debug line for for KexiDB database
 	KEXIUTILS_EXPORT void addKexiDBDebug(const TQString& text);
diff --git a/kexi/kexiutils/utils_p.h b/kexi/kexiutils/utils_p.h
index b91f22371..41d864259 100644
--- a/kexi/kexiutils/utils_p.h
+++ b/kexi/kexiutils/utils_p.h
@@ -44,8 +44,8 @@ class DelayedCursorHandler : public TQObject
 class DebugWindowDialog : public TQDialog
 {
 	public:
-		explicit DebugWindowDialog( TQWidget * tqparent )
-		 : TQDialog(tqparent, 0, false, TQt::WType_Dialog|TQt::WStyle_MinMax|TQt::WStyle_StaysOnTop)
+		explicit DebugWindowDialog( TQWidget * parent )
+		 : TQDialog(parent, 0, false, TQt::WType_Dialog|TQt::WStyle_MinMax|TQt::WStyle_StaysOnTop)
 		{
 			setWindowState( TQt::WindowMinimized );
 		}
diff --git a/kexi/kexiutils/validator.cpp b/kexi/kexiutils/validator.cpp
index 54af4ccde..bec7a1ec9 100644
--- a/kexi/kexiutils/validator.cpp
+++ b/kexi/kexiutils/validator.cpp
@@ -21,8 +21,8 @@
 
 using namespace KexiUtils;
 
-Validator::Validator(TQObject * tqparent, const char * name)
-: TQValidator(tqparent,name)
+Validator::Validator(TQObject * parent, const char * name)
+: TQValidator(parent,name)
 , m_acceptsEmptyValue(false)
 {
 }
@@ -57,15 +57,15 @@ TQValidator::State Validator::validate ( TQString & , int & ) const
 
 //-----------------------------------------------------------
 
-MultiValidator::MultiValidator(TQObject* tqparent, const char * name)
- : Validator(tqparent, name)
+MultiValidator::MultiValidator(TQObject* parent, const char * name)
+ : Validator(parent, name)
 {
 	m_ownedSubValidators.setAutoDelete(true);
 }
 
 MultiValidator::MultiValidator(TQValidator *validator, 
-	TQObject * tqparent, const char * name)
- : Validator(tqparent, name)
+	TQObject * parent, const char * name)
+ : Validator(parent, name)
 {
 	addSubvalidator(validator);
 }
@@ -76,7 +76,7 @@ void MultiValidator::addSubvalidator( TQValidator* validator, bool owned )
 	if (!validator)
 		return;
 	m_subValidators.append(validator);
-	if (owned && !validator->tqparent())
+	if (owned && !validator->parent())
 		m_ownedSubValidators.append(validator);
 }
 
diff --git a/kexi/kexiutils/validator.h b/kexi/kexiutils/validator.h
index b5c6e6cc1..684a30fcd 100644
--- a/kexi/kexiutils/validator.h
+++ b/kexi/kexiutils/validator.h
@@ -47,7 +47,7 @@ class KEXIUTILS_EXPORT Validator : public TQValidator
 	public:
 		typedef enum Result { Error = 0, Ok = 1, Warning = 2 };
 
-		Validator(TQObject * tqparent = 0, const char * name = 0);
+		Validator(TQObject * parent = 0, const char * name = 0);
 		virtual ~Validator();
 
 		/*! Sets accepting empty values on (true) or off (false). 
@@ -122,16 +122,16 @@ class KEXIUTILS_EXPORT MultiValidator : public Validator
 	public:
 		/*! Constructs multivalidator with no subvalidators defined.
 		 You can add more validators with addSubvalidator(). */
-		MultiValidator(TQObject * tqparent = 0, const char * name = 0);
+		MultiValidator(TQObject * parent = 0, const char * name = 0);
 
 		/*! Constructs multivalidator with one validator \a validator.
-		 It will be owned if has no tqparent defined.
+		 It will be owned if has no parent defined.
 		 You can add more validators with addSubvalidator(). */
-		MultiValidator(TQValidator *validator, TQObject * tqparent = 0, const char * name = 0);
+		MultiValidator(TQValidator *validator, TQObject * parent = 0, const char * name = 0);
 
 		/*! Adds validator \a validator as another subvalidator.
 		 Subvalidator will be owned by this multivalidator if \a owned is true
-		 and its tqparent is NULL. */
+		 and its parent is NULL. */
 		void addSubvalidator( TQValidator* validator, bool owned = true );
 
 		/*! Reimplemented to call validate() on subvalidators. */
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 6f451aefe..0aa0cd352 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -48,18 +48,18 @@ class KexiFindDialog::Private
 		}
 		//! Connects action \a action with appropriate signal \a member
 		//! and optionally adds accel that will receive shortcut for \a action 
-		//! at global scope of the dialog \a tqparent.
-		void setActionAndAccel(KAction *action, TQWidget* tqparent, const char* member)
+		//! at global scope of the dialog \a parent.
+		void setActionAndAccel(KAction *action, TQWidget* parent, const char* member)
 		{
 			if (!action)
 				return;
-			TQObject::connect(tqparent, member, action, TQT_SLOT(activate()));
+			TQObject::connect(parent, member, action, TQT_SLOT(activate()));
 			if (action->shortcut().isNull())
 				return;
-			TQAccel *accel = new TQAccel(tqparent); // we want to handle dialog-wide shortcut as well
+			TQAccel *accel = new TQAccel(parent); // we want to handle dialog-wide shortcut as well
 			accels.append( accel );
 			accel->connectItem(
-				accel->insertItem( action->shortcut() ), tqparent, member );
+				accel->insertItem( action->shortcut() ), parent, member );
 		}
 
 		TQStringList lookInColumnNames;
@@ -75,8 +75,8 @@ class KexiFindDialog::Private
 
 //------------------------------------------
 
-KexiFindDialog::KexiFindDialog( TQWidget* tqparent )
- : KexiFindDialogBase(tqparent, "KexiFindDialog", false/*!modal*/, 
+KexiFindDialog::KexiFindDialog( TQWidget* parent )
+ : KexiFindDialogBase(parent, "KexiFindDialog", false/*!modal*/, 
 	TQt::WType_Dialog|TQt::WStyle_NormalBorder|TQt::WStyle_Title
 	|TQt::WStyle_SysMenu|TQt::WStyle_Customize|TQt::WStyle_Tool)
  , d( new Private() )
diff --git a/kexi/main/kexifinddialog.h b/kexi/main/kexifinddialog.h
index 4cf55e537..70d139174 100644
--- a/kexi/main/kexifinddialog.h
+++ b/kexi/main/kexifinddialog.h
@@ -37,7 +37,7 @@ class KexiFindDialog : public KexiFindDialogBase
   TQ_OBJECT
 	public:
 		//! Creates a new find dialog. Replace mode is off by default.
-		KexiFindDialog(TQWidget* tqparent);
+		KexiFindDialog(TQWidget* parent);
 		virtual ~KexiFindDialog();
 
 		//! Sets actions that receive button clicks and shortcuts within the dialog. Should be called once.
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index a14ebfbb9..37ff1c83f 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -3514,7 +3514,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 			else {
 /*			TQObject* o = tqfocusWidget();
 			while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase"))
-				o = o->tqparent();*/
+				o = o->parent();*/
 //js				invalidateSharedActions(focus_w);
 			}
 		}
diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp
index c9b78f364..45cbc4497 100644
--- a/kexi/main/kexinamedialog.cpp
+++ b/kexi/main/kexinamedialog.cpp
@@ -20,13 +20,13 @@
 #include "kexinamedialog.h"
 
 KexiNameDialog::KexiNameDialog(const TQString& message, 
-	TQWidget * tqparent, const char * name)
+	TQWidget * parent, const char * name)
  : KDialogBase(KDialogBase::Plain, TQString(),
 	KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help,
 	KDialogBase::Ok,
-	tqparent, name)
+	parent, name)
 {
-//	TQHBox ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 )
+//	TQHBox ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 )
 	m_widget= new KexiNameWidget(message, plainPage(), "KexiNameWidget");
 	init();
 }
@@ -34,11 +34,11 @@ KexiNameDialog::KexiNameDialog(const TQString& message,
 KexiNameDialog::KexiNameDialog(const TQString& message, 
 	const TQString& nameLabel, const TQString& nameText, 
 	const TQString& captionLabel, const TQString& captionText, 
-	TQWidget * tqparent, const char * name)
+	TQWidget * parent, const char * name)
  : KDialogBase(KDialogBase::Plain, TQString(),
 	KDialogBase::Ok|KDialogBase::Cancel,
 	KDialogBase::Ok,
-	tqparent, name)
+	parent, name)
 {
 	m_widget= new KexiNameWidget(message, nameLabel, nameText,
 		captionLabel, captionText, plainPage(), "KexiNameWidget");
diff --git a/kexi/main/kexinamedialog.h b/kexi/main/kexinamedialog.h
index c4453c0d3..365214e20 100644
--- a/kexi/main/kexinamedialog.h
+++ b/kexi/main/kexinamedialog.h
@@ -31,12 +31,12 @@ class KEXIMAIN_EXPORT KexiNameDialog : public KDialogBase
 
 	public:
 		KexiNameDialog(const TQString& message, 
-			TQWidget * tqparent = 0, const char * name = 0);
+			TQWidget * parent = 0, const char * name = 0);
 
 		KexiNameDialog(const TQString& message, 
 			const TQString& nameLabel, const TQString& nameText, 
 			const TQString& captionLabel, const TQString& captionText, 
-			TQWidget * tqparent = 0, const char * name = 0);
+			TQWidget * parent = 0, const char * name = 0);
 		
 		virtual ~KexiNameDialog();
 
diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp
index db061d936..c6ca8f417 100644
--- a/kexi/main/kexinamewidget.cpp
+++ b/kexi/main/kexinamewidget.cpp
@@ -33,8 +33,8 @@
 using namespace KexiUtils;
 
 KexiNameWidget::KexiNameWidget( const TQString& message, 
-	TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget(tqparent, name, fl)
+	TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget(parent, name, fl)
 {
 	init(message, TQString(), TQString(), TQString(), TQString());
 }
@@ -42,9 +42,9 @@ KexiNameWidget::KexiNameWidget( const TQString& message,
 KexiNameWidget::KexiNameWidget(const TQString& message, 
 	const TQString& nameLabel, const TQString& nameText, 
 	const TQString& captionLabel, const TQString& captionText, 
-	TQWidget * tqparent, const char * name, WFlags fl)
+	TQWidget * parent, const char * name, WFlags fl)
 {
-	Q_UNUSED( tqparent );
+	Q_UNUSED( parent );
 	Q_UNUSED( name );
 	Q_UNUSED( fl );
 
diff --git a/kexi/main/kexinamewidget.h b/kexi/main/kexinamewidget.h
index 1ab1d1068..acbeed5ca 100644
--- a/kexi/main/kexinamewidget.h
+++ b/kexi/main/kexinamewidget.h
@@ -36,12 +36,12 @@ class KEXIMAIN_EXPORT KexiNameWidget : public TQWidget
 
 	public:
 		KexiNameWidget(const TQString& message, 
-			TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0);
+			TQWidget * parent = 0, const char * name = 0, WFlags fl = 0);
 
 		KexiNameWidget(const TQString& message, 
 			const TQString& nameLabel, const TQString& nameText, 
 			const TQString& captionLabel, const TQString& captionText, 
-			TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0);
+			TQWidget * parent = 0, const char * name = 0, WFlags fl = 0);
 
 		virtual ~KexiNameWidget(); 
 
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 2e26b356b..c6bd3a961 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -30,12 +30,12 @@
 
 #include "kexinewstuff.h"
 
-KexiNewStuff::KexiNewStuff(TQWidget *tqparent)
+KexiNewStuff::KexiNewStuff(TQWidget *parent)
  : KNewStuff( "kexi/template"
 #if KDE_IS_VERSION(3,3,0)
 	, "http://download.kde.org/khotnewstuff/kexi-providers.xml"
 #endif
-	, tqparent)
+	, parent)
 {
 	// Prevent GHNS to deny downloading a second time. If GHNS
 	// fails to download something, it still marks the thing as
diff --git a/kexi/main/kexinewstuff.h b/kexi/main/kexinewstuff.h
index 0247e7067..e2966841e 100644
--- a/kexi/main/kexinewstuff.h
+++ b/kexi/main/kexinewstuff.h
@@ -27,7 +27,7 @@
 class KexiNewStuff : public KNewStuff
 {
 	public:
-		KexiNewStuff(TQWidget *tqparent);
+		KexiNewStuff(TQWidget *parent);
 		virtual ~KexiNewStuff();
 
 		virtual bool install( const TQString &fileName );
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index 2d51cad54..bfee98594 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -38,8 +38,8 @@
 #include <ktexteditor/viewstatusmsginterface.h>
 #endif
 
-KexiStatusBar::KexiStatusBar(TQWidget *tqparent, const char *name)
-    : KStatusBar(tqparent, name)
+KexiStatusBar::KexiStatusBar(TQWidget *parent, const char *name)
+    : KStatusBar(parent, name)
 #if KexiStatusBar_KTEXTEDITOR_USED
 	, m_cursorIface(0)
 #endif
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index 0cd5f6c6c..c498e2f57 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -43,7 +43,7 @@ class KexiStatusBar : public KStatusBar
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiStatusBar( TQWidget *tqparent=0, const char *name=0 );
+		KexiStatusBar( TQWidget *parent=0, const char *name=0 );
 		virtual ~KexiStatusBar();
 //		virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false);
 
diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h
index 9bf359b17..3fe7b28d0 100644
--- a/kexi/main/ksplitter.h
+++ b/kexi/main/ksplitter.h
@@ -51,12 +51,12 @@ class KDockSplitter : public TQWidget
 public:
   /**
    * Constructor.
-   * @param tqparent tqparent widget
+   * @param parent parent widget
    * @param name name
    * @param orient orientation. Either @pQt::Vertical or @pQt::Horizontal
    * @param pos procentual position of the splitter. Must be int [0...100].
    */
-  KDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50);
+  KDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50);
   virtual ~KDockSplitter(){};
 
   /**
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 59a86efda..45ab58929 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -116,8 +116,8 @@ void KexiSimplePrintingSettings::save()
 //------------------------
 
 KexiSimplePrintingEngine::KexiSimplePrintingEngine(
-	const KexiSimplePrintingSettings& settings, TQObject* tqparent)
- : TQObject(tqparent, "KexiSimplePrintingEngine")
+	const KexiSimplePrintingSettings& settings, TQObject* parent)
+ : TQObject(parent, "KexiSimplePrintingEngine")
  , m_settings(&settings)
  , m_pdm(0)
 {
diff --git a/kexi/main/printing/kexisimpleprintingengine.h b/kexi/main/printing/kexisimpleprintingengine.h
index f3a5371de..8c6d995d3 100644
--- a/kexi/main/printing/kexisimpleprintingengine.h
+++ b/kexi/main/printing/kexisimpleprintingengine.h
@@ -60,7 +60,7 @@ class KexiSimplePrintingEngine : public TQObject
   TQ_OBJECT
 
 	public:
-		KexiSimplePrintingEngine( const KexiSimplePrintingSettings& settings, TQObject* tqparent );
+		KexiSimplePrintingEngine( const KexiSimplePrintingSettings& settings, TQObject* parent );
 		~KexiSimplePrintingEngine();
 
 		bool init(KexiDB::Connection& conn, KexiDB::TableOrQuerySchema& tableOrQuery,
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index f528cb234..f8634e82e 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -47,8 +47,8 @@
 #include <kexiutils/tristate.h>
 
 KexiSimplePrintingCommand::KexiSimplePrintingCommand(
-	KexiMainWindow* mainWin, int objectId, TQObject* tqparent)
- : TQObject(tqparent, "KexiSimplePrintCommand")
+	KexiMainWindow* mainWin, int objectId, TQObject* parent)
+ : TQObject(parent, "KexiSimplePrintCommand")
  , m_previewEngine(0)
  , m_mainWin(mainWin)
  , m_objectId(objectId)
@@ -297,9 +297,9 @@ void KexiSimplePrintingCommand::slotShowPageSetupRequested()
 
 //----------------------------------------------------------
 
-KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *tqparent, 
+KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *parent, 
 	TQMap<TQString,TQString>* args )
-	: KexiViewBase( mainWin, tqparent, "KexiSimplePrintingPageSetup" )
+	: KexiViewBase( mainWin, parent, "KexiSimplePrintingPageSetup" )
 	, m_settings( KexiSimplePrintingSettings::load() )
 //	, m_command(0)
 {
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.h b/kexi/main/printing/kexisimpleprintingpagesetup.h
index b2fbc6686..6efd13142 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.h
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.h
@@ -42,7 +42,7 @@ class KexiSimplePrintingCommand : public TQObject
 
 	public:
 		KexiSimplePrintingCommand(KexiMainWindow* mainWin, int objectId, 
-			TQObject* tqparent = 0);
+			TQObject* parent = 0);
 		~KexiSimplePrintingCommand();
 
 	public slots:
@@ -76,7 +76,7 @@ class KexiSimplePrintingPageSetup : public KexiViewBase
   TQ_OBJECT
 
 	public:
-		KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *tqparent, TQMap<TQString,TQString>* args );
+		KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *parent, TQMap<TQString,TQString>* args );
 		~KexiSimplePrintingPageSetup();
 
 	public slots:
diff --git a/kexi/main/printing/kexisimpleprintingpart.cpp b/kexi/main/printing/kexisimpleprintingpart.cpp
index ca751003e..048f92ae0 100644
--- a/kexi/main/printing/kexisimpleprintingpart.cpp
+++ b/kexi/main/printing/kexisimpleprintingpart.cpp
@@ -48,12 +48,12 @@ KexiSimplePrintingPart::~KexiSimplePrintingPart()
 {
 }
 
-KexiViewBase* KexiSimplePrintingPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+KexiViewBase* KexiSimplePrintingPart::createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>* args)
 {
 	Q_UNUSED( item );
 	if (viewMode == Kexi::DesignViewMode) {
-		KexiSimplePrintingPageSetup *w = new KexiSimplePrintingPageSetup( dialog->mainWin(), tqparent, args );
+		KexiSimplePrintingPageSetup *w = new KexiSimplePrintingPageSetup( dialog->mainWin(), parent, args );
 		return w;
 	}
 
diff --git a/kexi/main/printing/kexisimpleprintingpart.h b/kexi/main/printing/kexisimpleprintingpart.h
index 6e44ff4c3..00c44b50b 100644
--- a/kexi/main/printing/kexisimpleprintingpart.h
+++ b/kexi/main/printing/kexisimpleprintingpart.h
@@ -44,7 +44,7 @@ class KexiSimplePrintingPart : public KexiPart::StaticPart
 		virtual ~KexiSimplePrintingPart();
 
 	protected:
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>* staticObjectArgs);
 };
 
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 960a23b2f..68c1c6735 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -36,8 +36,8 @@
 #include <kapplication.h>
 
 KexiSimplePrintPreviewView::KexiSimplePrintPreviewView(
-	TQWidget *tqparent, KexiSimplePrintPreviewWindow *window)
- : TQWidget(tqparent, "KexiSimplePrintPreviewView", WStaticContents)//|WNoAutoErase)
+	TQWidget *parent, KexiSimplePrintPreviewWindow *window)
+ : TQWidget(parent, "KexiSimplePrintPreviewView", WStaticContents)//|WNoAutoErase)
  , m_window(window)
 {
 	enablePainting = false;
@@ -150,8 +150,8 @@ void KexiSimplePrintPreviewScrollView::setContentsPos(int x, int y)
 
 KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	KexiSimplePrintingEngine &engine, const TQString& previewName, 
-	TQWidget *tqparent, WFlags f)
- : TQWidget(tqparent, "KexiSimplePrintPreviewWindow", f)
+	TQWidget *parent, WFlags f)
+ : TQWidget(parent, "KexiSimplePrintPreviewWindow", f)
  , m_engine(engine)
  , m_settings(*m_engine.settings())
  , m_pageNumber(-1)
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.h b/kexi/main/printing/kexisimpleprintpreviewwindow.h
index d3119339d..35870285f 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.h
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.h
@@ -38,7 +38,7 @@ class KexiSimplePrintPreviewWindow : public TQWidget
 
 	public:
 		KexiSimplePrintPreviewWindow(KexiSimplePrintingEngine &engine,
-			const TQString& previewName, TQWidget *tqparent, WFlags f = 0);
+			const TQString& previewName, TQWidget *parent, WFlags f = 0);
 		~KexiSimplePrintPreviewWindow();
 
 		int currentPage() const { return m_pageNumber; }
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow_p.h b/kexi/main/printing/kexisimpleprintpreviewwindow_p.h
index 2c72e8a16..5246d3295 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow_p.h
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow_p.h
@@ -25,7 +25,7 @@
 class KexiSimplePrintPreviewView : public TQWidget
 {
 	public:
-		KexiSimplePrintPreviewView(TQWidget *tqparent, KexiSimplePrintPreviewWindow *window);
+		KexiSimplePrintPreviewView(TQWidget *parent, KexiSimplePrintPreviewWindow *window);
 
 		virtual void paintEvent( TQPaintEvent *pe );
 
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 797dcc2a9..a9a2a3166 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -101,8 +101,8 @@ public:
 /*================================================================*/
 
 KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, 
-	const TQString& startDirOrVariable, TQWidget* tqparent, const char* name )
-	: TQWidget( tqparent, name )
+	const TQString& startDirOrVariable, TQWidget* parent, const char* name )
+	: TQWidget( parent, name )
 	,d(new KexiConnSelectorWidgetPrivate())
 {
 	d->conn_set = &conn_set;
diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h
index 2f4a9fe96..c42fc5362 100644
--- a/kexi/main/startup/KexiConnSelector.h
+++ b/kexi/main/startup/KexiConnSelector.h
@@ -67,7 +67,7 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public TQWidget
 		 in KRecentDirs documentation). */
 		KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, 
 			const TQString& startDirOrVariable, 
-			TQWidget* tqparent = 0, const char* name = 0 );
+			TQWidget* parent = 0, const char* name = 0 );
 
 		virtual ~KexiConnSelectorWidget();
 		
diff --git a/kexi/main/startup/KexiDBTitlePage.cpp b/kexi/main/startup/KexiDBTitlePage.cpp
index 4d686039b..7c97440ca 100644
--- a/kexi/main/startup/KexiDBTitlePage.cpp
+++ b/kexi/main/startup/KexiDBTitlePage.cpp
@@ -21,8 +21,8 @@
 
 #include <tqlabel.h>
 
-KexiDBTitlePage::KexiDBTitlePage( const TQString& labelText, TQWidget* tqparent, const char* name )
- : KexiDBTitlePageBase( tqparent, name )
+KexiDBTitlePage::KexiDBTitlePage( const TQString& labelText, TQWidget* parent, const char* name )
+ : KexiDBTitlePageBase( parent, name )
 {
 	if (!labelText.isEmpty())
 		label->setText(labelText);
diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h
index 15030c7bc..4ac59bc00 100644
--- a/kexi/main/startup/KexiDBTitlePage.h
+++ b/kexi/main/startup/KexiDBTitlePage.h
@@ -31,7 +31,7 @@ class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase
 public:
 	//! Constructs title page. \a labelText can be provided to change default 
 	//! "Project caption:" label.
-	KexiDBTitlePage( const TQString& labelText, TQWidget* tqparent = 0, const char* name = 0 );
+	KexiDBTitlePage( const TQString& labelText, TQWidget* parent = 0, const char* name = 0 );
 	~KexiDBTitlePage();
 	
 protected slots:
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 9e897e8fb..b24a66abf 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -84,8 +84,8 @@ class KexiNewProjectWizardPrivate
 };
 
 KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
-	TQWidget *tqparent, const char *name, bool modal, WFlags f)
-: KWizard(tqparent, name, modal, f)
+	TQWidget *parent, const char *name, bool modal, WFlags f)
+: KWizard(parent, name, modal, f)
 , d(new KexiNewProjectWizardPrivate() )
 {
 	d->msgHandler = new KexiGUIMessageHandler(this);
diff --git a/kexi/main/startup/KexiNewProjectWizard.h b/kexi/main/startup/KexiNewProjectWizard.h
index 18dab2570..ff16b996e 100644
--- a/kexi/main/startup/KexiNewProjectWizard.h
+++ b/kexi/main/startup/KexiNewProjectWizard.h
@@ -39,7 +39,7 @@ class KEXIMAIN_EXPORT KexiNewProjectWizard : public KWizard
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiNewProjectWizard(KexiDBConnectionSet& conn_set, TQWidget *tqparent=0, 
+		KexiNewProjectWizard(KexiDBConnectionSet& conn_set, TQWidget *parent=0, 
 			const char *name=0, bool modal=false, WFlags f=0);
 		~KexiNewProjectWizard();
 	
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 55aa930f6..9353e3a6d 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -91,14 +91,14 @@ public:
 /*================================================================*/
 
 /*!
- *  Constructs a KexiProjectSelector which is a child of 'tqparent', with the 
+ *  Constructs a KexiProjectSelector which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
 KexiProjectSelectorWidget::KexiProjectSelectorWidget( 
-	TQWidget* tqparent, const char* name, 
+	TQWidget* parent, const char* name, 
 	KexiProjectSet* prj_set, bool showProjectNameColumn,
 	bool showConnectionColumns )
-    : KexiProjectSelectorBase( tqparent, name )
+    : KexiProjectSelectorBase( parent, name )
 	,m_prj_set(prj_set)
 	,d(new KexiProjectSelectorWidgetPrivate())
 {
@@ -217,19 +217,19 @@ bool KexiProjectSelectorWidget::isSelectable() const
 
 /*================================================================*/
 
-KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 	KexiProjectSet* prj_set, bool showProjectNameColumn, bool showConnectionColumns)
 	: KDialogBase( Plain, i18n("Open Recent Project"), 
 #ifndef KEXI_NO_UNFINISHED 
 	//! @todo re-add Help when doc is available
 	Help | 
 #endif
-	Ok | Cancel, Ok, tqparent, name )
+	Ok | Cancel, Ok, parent, name )
 {
 	init(prj_set, showProjectNameColumn, showConnectionColumns);
 }
 
-KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 	KexiDB::ConnectionData* cdata, 
 	bool showProjectNameColumn, bool showConnectionColumns)
 	: KDialogBase( 
@@ -238,7 +238,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const
 	//! @todo re-add Help when doc is available
 	Help | 
 #endif
-	Ok | Cancel, Ok, tqparent, name, true/*modal*/, false/*sep*/ )
+	Ok | Cancel, Ok, parent, name, true/*modal*/, false/*sep*/ )
 {
 	setButtonGuiItem(Ok, KGuiItem(i18n("&Open"), "fileopen", i18n("Open Database Connection")));
 	assert(cdata);
diff --git a/kexi/main/startup/KexiProjectSelector.h b/kexi/main/startup/KexiProjectSelector.h
index 91c137124..43c6a6b5e 100644
--- a/kexi/main/startup/KexiProjectSelector.h
+++ b/kexi/main/startup/KexiProjectSelector.h
@@ -45,7 +45,7 @@ public:
 	 information about database driver and connection columns are added.
 	 \a prj_set may be NULL - you can assign a set later with setProjectSet().
 	*/
-	KexiProjectSelectorWidget( TQWidget* tqparent = 0, const char* name = 0, 
+	KexiProjectSelectorWidget( TQWidget* parent = 0, const char* name = 0, 
 		KexiProjectSet* prj_set = 0, bool showProjectNameColumn = true,
 		bool showConnectionColumns = true );
     
@@ -99,7 +99,7 @@ public:
 	/*! Constructor 1, used for displaying recent projects list
 	 Label "there are recently opened projects" is displayed automatically
 	*/
-	KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+	KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 		KexiProjectSet* prj_set, 
 		bool showProjectNameColumn = true, bool showConnectionColumns = true);
 
@@ -107,7 +107,7 @@ public:
 	 Label "Select one of these existing projects on server" is displayed automatically
 	 You should test if project set was properly loaded using projectSet()->error().
 	*/
-	KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+	KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 		KexiDB::ConnectionData* cdata, 
 		bool showProjectNameColumn = true, bool showConnectionColumns = true);
 	
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 13becfc8b..61746d5c3 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -134,9 +134,9 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen)
 
 //---------------------------------
 
-KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *tqparent, KexiDB::ConnectionData& cdata, bool showDetailsButton)
+KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionData& cdata, bool showDetailsButton)
  : KPasswordDialog( KPasswordDialog::Password, false/*keep*/, 
-	showDetailsButton ? (int)KDialogBase::User1 : 0, tqparent )
+	showDetailsButton ? (int)KDialogBase::User1 : 0, parent )
  , m_cdata(&cdata)
  , m_showConnectionDetailsRequested(false)
 {
@@ -739,7 +739,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 
 tristate KexiStartupHandler::detectActionForFile( 
 	KexiStartupData::Import& detectedImportAction, TQString& detectedDriverName,
-	const TQString& _suggestedDriverName, const TQString &dbFileName, TQWidget *tqparent, int options )
+	const TQString& _suggestedDriverName, const TQString &dbFileName, TQWidget *parent, int options )
 {
 	detectedImportAction = KexiStartupData::Import(); //clear
 	TQString suggestedDriverName(_suggestedDriverName); //safe
@@ -747,7 +747,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	TQFileInfo finfo(dbFileName);
 	if (dbFileName.isEmpty() || !finfo.isReadable()) {
 		if (!(options & SkipMessages))
-			KMessageBox::sorry(tqparent, i18n("<p>Could not open project.</p>")
+			KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 				+i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>")
 				.tqarg(TQDir::convertSeparators(dbFileName))
 				+i18n("Check the file's permissions and whether it is already opened "
@@ -779,7 +779,7 @@ tristate KexiStartupHandler::detectActionForFile(
 		if (!f.open(IO_ReadOnly)) {
 			// BTW: similar error msg is provided in SQLiteConnection::drv_useDatabase()
 			if (!(options & SkipMessages))
-				KMessageBox::sorry(tqparent, i18n("<p>Could not open project.</p>")
+				KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 					+i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>")
 					.tqarg(TQDir::convertSeparators(dbFileName))
 					+i18n("Check the file's permissions and whether it is already opened "
@@ -802,7 +802,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	if (ptr.data()) {
 		if (mimename=="application/x-msaccess") {
 			if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo(
-				tqparent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
+				parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
 				"Do you want to import the file as a Kexi project?")
 				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()),
 				i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) )
@@ -826,7 +826,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	if (!useDetectedDriver) {
 		int res = KMessageBox::Yes;
 		if (!(options & SkipMessages))
-			res = KMessageBox::warningYesNoCancel(tqparent, i18n(
+			res = KMessageBox::warningYesNoCancel(parent, i18n(
 			 "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?")
@@ -848,7 +848,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	const TQString newFileFormat = "SQLite3";
 	if (!(options & DontConvert || options & SkipMessages) 
 		&& detectedDriverName.lower()=="sqlite2" && detectedDriverName.lower()!=suggestedDriverName.lower()
-		&& KMessageBox::Yes == KMessageBox::questionYesNo(tqparent, i18n(
+		&& KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n(
 			"Previous version of database file format (\"%1\") is detected in the \"%2\" "
 			"project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?")
 			.tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) )
@@ -859,7 +859,7 @@ tristate KexiStartupHandler::detectActionForFile(
 //		kdDebug() << "--- migr.run() END ---" <<endl;
 		if (!res) {
 			//TODO msg
-			KMessageBox::sorry(tqparent, i18n(
+			KMessageBox::sorry(parent, i18n(
 				"Failed to convert project file \"%1\" to a new \"%2\" format.\n"
 				"The file format remains unchanged.")
 				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) );
@@ -876,7 +876,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>");
 		}
 		if (!(options & SkipMessages))
-			KMessageBox::detailedSorry(tqparent, 
+			KMessageBox::detailedSorry(parent, 
 				i18n( "The file \"%1\" is not recognized as being supported by Kexi.")
 					.tqarg(TQDir::convertSeparators(dbFileName)),
 				TQString::tqfromLatin1("<p>")
@@ -892,7 +892,7 @@ tristate KexiStartupHandler::detectActionForFile(
 }
 
 KexiProjectData*
-KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *tqparent)
+KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent)
 {
 	cleartqStatus();
 	cancelled = false;
@@ -911,7 +911,7 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled
 	}
 	KexiProjectData* projectData = 0;
 	//dialog for selecting a project
-	KexiProjectSelectorDialog prjdlg( tqparent, "prjdlg", cdata, true, false );
+	KexiProjectSelectorDialog prjdlg( parent, "prjdlg", cdata, true, false );
 	if (!prjdlg.projectSet() || prjdlg.projectSet()->error()) {
 		KexiGUIMessageHandler msgh;
 		if (prjdlg.projectSet())
diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h
index 22c554403..fe1b3cf04 100644
--- a/kexi/main/startup/KexiStartup.h
+++ b/kexi/main/startup/KexiStartup.h
@@ -42,7 +42,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiDBPasswordDialog(TQWidget *tqparent, KexiDB::ConnectionData& cdata, bool showDetailsButton = false);
+		KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionData& cdata, bool showDetailsButton = false);
 		virtual ~KexiDBPasswordDialog();
 
 		bool showConnectionDetailsRequested() const { return m_showConnectionDetailsRequested; }
@@ -73,12 +73,12 @@ class KEXIMAIN_EXPORT KexiStartupHandler
 	#if 0
 		/*! Used for opening existing projects. 
 		 Detects project file type by mime type and returns project data, if it can be detected,
-		 otherwise - NULL. \a tqparent is passed as tqparent for potential error message boxes.
+		 otherwise - NULL. \a parent is passed as parent for potential error message boxes.
 		 Also uses \a cdata connection data for server-based projects.
 		 cdata.driverName is adjusted, if a file-based project has been detected.
 		*/
 		static KexiProjectData* detectProjectData( 
-			KexiDB::ConnectionData& cdata, const TQString &dbname, TQWidget *tqparent);
+			KexiDB::ConnectionData& cdata, const TQString &dbname, TQWidget *parent);
 	#endif
 
 		/*! Options for detectDriverForFile() */
@@ -103,20 +103,20 @@ class KEXIMAIN_EXPORT KexiStartupHandler
 		 - "shortcut" if the file looks like a shortcut to a project/connection file
 		 - "connection" if the file looks like a connection data file.
 
-		 \a tqparent is passed as a tqparent for potential error message boxes.
+		 \a parent is passed as a parent for potential error message boxes.
 		 \a driverName is a preferred driver name. 
 		 \a options should be a combination of DetectDriverForFileOptions enum values. */
 		static tristate detectActionForFile( 
 			KexiStartupData::Import& detectedImportAction, TQString& detectedDriverName,
 			const TQString& _suggestedDriverName, 
-			const TQString &dbFileName, TQWidget *tqparent = 0, int options = 0 );
+			const TQString &dbFileName, TQWidget *parent = 0, int options = 0 );
 
 		/*! Allows user to select a project with KexiProjectSelectorDialog.
 			\return selected project's data
 			Returns NULL and sets cancelled to true if the dialog was cancelled.
 			Returns NULL and sets cancelled to false if there was an error.
 		*/
-		KexiProjectData* selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *tqparent = 0);
+		KexiProjectData* selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent = 0);
 
 	protected slots:
 		void slotSaveShortcutFileChanges();
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 40ced9b1e..436667066 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -142,21 +142,21 @@ TQString captionForDialogType(int type)
 }
 
 /*================================================================*/
-/*KexiStartupDialog::KexiStartupDialog(TQWidget *tqparent, const char *name, KInstance* global,
+/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, KInstance* global,
 	const TQCString &format, const TQString &nativePattern,
 	const TQString &nativeName, const DialogType &dialogType,
 	const TQCString& templateType) :
-	KDialogBase(tqparent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel,
+	KDialogBase(parent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel,
 	KDialogBase::Ok) {
 */
 KexiStartupDialog::KexiStartupDialog(
 	int dialogType, int dialogOptions,
 	KexiDBConnectionSet& connSet, KexiProjectSet& recentProjects,
-	TQWidget *tqparent, const char *name )
+	TQWidget *parent, const char *name )
  : KDialogBase(
  	dlgSinglePage(dialogType) ? Plain : Tabbed
 	,captionForDialogType(dialogType)
- 	,Help | Ok | Cancel, Ok, tqparent, name )
+ 	,Help | Ok | Cancel, Ok, parent, name )
  , d(new KexiStartupDialogPrivate())
 {
 	d->recentProjects = &recentProjects;
diff --git a/kexi/main/startup/KexiStartupDialog.h b/kexi/main/startup/KexiStartupDialog.h
index 0f994ff32..aad9ec9ed 100644
--- a/kexi/main/startup/KexiStartupDialog.h
+++ b/kexi/main/startup/KexiStartupDialog.h
@@ -89,7 +89,7 @@ public:
 	 @param recentProjects a set of recent projects' info, used for "Open recent" tab
 	 @param connSet conenction set used to present available conenctions
 	  in "Open Existing" tab. Pass an empty object is this tab is not used.
-	 @param tqparent tqparent widget, if any.
+	 @param parent parent widget, if any.
 	 @param name name of this object.
 	 */
 	KexiStartupDialog(
@@ -97,7 +97,7 @@ public:
 		int dialogOptions,
 		KexiDBConnectionSet& connSet,
 		KexiProjectSet& recentProjects,
-		TQWidget *tqparent = 0, const char *name = 0 );
+		TQWidget *parent = 0, const char *name = 0 );
 	~KexiStartupDialog();
 
 	/*! \return true if startup dialog should be shown (info is taken from kexi config)
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index 52fe08707..429499f4f 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -52,10 +52,10 @@
 class TemplateItem : public KListViewItem
 {
 	public:
-		TemplateItem(TQListView* tqparent, const TQString& aFilename, 
+		TemplateItem(TQListView* parent, const TQString& aFilename, 
 			const TQString& name, const TQString& description, const TQPixmap& icon, 
 			const TQValueList<KexiProjectData::ObjectInfo>& aAutoopenObjects)
-		: KListViewItem(tqparent, name + "\n" + description)
+		: KListViewItem(parent, name + "\n" + description)
 		, autoopenObjects(aAutoopenObjects)
 		, filename(aFilename)
 		{
@@ -69,8 +69,8 @@ class TemplateItem : public KListViewItem
 
 //-----------------------
 
-KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * tqparent )
-	: KListView(tqparent, "KexiStartupDialogTemplatesPage")
+KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * parent )
+	: KListView(parent, "KexiStartupDialogTemplatesPage")
 	, m_popuplated(false)
 {
 	addColumn(TQString());
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
index 2cf50b7bf..2c7058d4e 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
@@ -30,7 +30,7 @@ class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public KListView
   TQ_OBJECT
 	
 	public:
-		KexiStartupDialogTemplatesPage( TQWidget * tqparent = 0 );
+		KexiStartupDialogTemplatesPage( TQWidget * parent = 0 );
 		~KexiStartupDialogTemplatesPage(); 
 //		void addItem(const TQString& key, const TQString& name, 
 //			const TQString& description, const TQPixmap& icon);
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index ed4dcd407..cd54602bf 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -37,8 +37,8 @@
 
 KexiStartupFileDialog::KexiStartupFileDialog(
 		const TQString& startDirOrVariable, int mode,
-		TQWidget *tqparent, const char *name)
-	:  KexiStartupFileDialogBase(startDirOrVariable, "", tqparent, name, 0)
+		TQWidget *parent, const char *name)
+	:  KexiStartupFileDialogBase(startDirOrVariable, "", parent, name, 0)
 	, m_confirmOverwrites(true)
 	, m_filtersUpdated(false)
 {
@@ -323,12 +323,12 @@ bool KexiStartupFileDialog::checkFileName()
 }
 
 //static 
-bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget *tqparent)
+bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget *parent)
 {
 	TQFileInfo fi(filePath);
 	if (!fi.exists())
 		return true;
-	const int res = KMessageBox::warningYesNo( tqparent, i18n( "The file \"%1\" already exists.\n"
+	const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n"
 		"Do you want to overwrite it?").tqarg( TQDir::convertSeparators(filePath) ), TQString(), 
 			i18n("Overwrite"), KStdGuiItem::no() );
 	if (res == KMessageBox::Yes)
diff --git a/kexi/main/startup/KexiStartupFileDialog.h b/kexi/main/startup/KexiStartupFileDialog.h
index 12fc3ef40..c85797db4 100644
--- a/kexi/main/startup/KexiStartupFileDialog.h
+++ b/kexi/main/startup/KexiStartupFileDialog.h
@@ -50,15 +50,15 @@ public:
 	};
 	
 	KexiStartupFileDialog(
-		const TQString& startDirOrVariable, int mode, TQWidget *tqparent=0, const char *name=0);
+		const TQString& startDirOrVariable, int mode, TQWidget *parent=0, const char *name=0);
 
 	virtual ~KexiStartupFileDialog();
 
 	/*! Helper. Displays "The file %1 already exists. Do you want to overwrite it?" yes/no message box.
-	 \a tqparent is used as a tqparent of the KMessageBox.
+	 \a parent is used as a parent of the KMessageBox.
 	 \return true if \a filePath file does not exists or user has agreed on overwriting,
 	 false in user do not want to overwrite. */
-	static bool askForOverwriting(const TQString& filePath, TQWidget *tqparent = 0);
+	static bool askForOverwriting(const TQString& filePath, TQWidget *parent = 0);
 
 	void setMode(int mode);
 
diff --git a/kexi/main/startup/KexiStartupFileDialogBase_win.h b/kexi/main/startup/KexiStartupFileDialogBase_win.h
index 00742c690..9231b7443 100644
--- a/kexi/main/startup/KexiStartupFileDialogBase_win.h
+++ b/kexi/main/startup/KexiStartupFileDialogBase_win.h
@@ -33,7 +33,7 @@ class KexiStartupFileDialogBase : public TQFileDialog
 {
 public:
 	KexiStartupFileDialogBase(const TQString & dirName, const TQString & filter = TQString(), 
-		TQWidget * tqparent = 0, const char * name = 0, bool modal = false );
+		TQWidget * parent = 0, const char * name = 0, bool modal = false );
 	~KexiStartupFileDialogBase();
 
 	TQPushButton * okButton() const { return m_okBtn; }
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index e716a607a..c81de131c 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -47,8 +47,8 @@ class KexiStartupFileDialogBasePrivate
 
 KexiStartupFileDialogBase::KexiStartupFileDialogBase(
 	const TQString & dirName, const TQString & filter, 
-	TQWidget * tqparent, const char * name, bool modal )
- : TQFileDialog( realStartDir(dirName), filter, tqparent, name, modal )
+	TQWidget * parent, const char * name, bool modal )
+ : TQFileDialog( realStartDir(dirName), filter, parent, name, modal )
  , d(new KexiStartupFileDialogBasePrivate())
 {
 //	TQString _dirName = dirName;
@@ -58,7 +58,7 @@ KexiStartupFileDialogBase::KexiStartupFileDialogBase(
 	if (_dirName.isEmpty())
 		_dirName = KGlobalSettings::documentPath();
 
-	init(_dirName, filter, tqparent);
+	init(_dirName, filter, parent);
 
 	//find "OK" button
 	TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "OK", false );
@@ -183,7 +183,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 
     // plug nav items into the toolbar
     coll->action( "up" )->plug( toolbar );
-    coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the tqparent directory.<p>"
+    coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the parent directory.<p>"
                                             "For instance, if the current location is file:/home/%1 clicking this "
                                             "button will take you to file:/home.</qt>").tqarg(getlogin()));
     coll->action( "back" )->plug( toolbar );
diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp
index 4741bf5ce..50d6726d0 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -36,13 +36,13 @@
 
 using namespace KexiMigration;
 
-OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* tqparent )
+OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* parent )
  : KDialogBase( 
 	KDialogBase::Plain, 
 	i18n( "Advanced Import Options" ),
 	Ok|Cancel, 
 	Ok,
-	tqparent, 
+	parent, 
 	"KexiMigration::OptionsDialog", 
 	true, 
 	false
diff --git a/kexi/migration/importoptionsdlg.h b/kexi/migration/importoptionsdlg.h
index f40e82302..e24e37c70 100644
--- a/kexi/migration/importoptionsdlg.h
+++ b/kexi/migration/importoptionsdlg.h
@@ -35,7 +35,7 @@ class OptionsDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* tqparent = 0 );
+		OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* parent = 0 );
 		virtual ~OptionsDialog();
 
 		KexiCharacterEncodingComboBox* encodingComboBox() const;
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index b97b6fcf4..9c1b45598 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -58,8 +58,8 @@ using namespace KexiMigration;
 
 //===========================================================
 //
-ImportWizard::ImportWizard(TQWidget *tqparent, TQMap<TQString,TQString>* args)
- : KWizard(tqparent)
+ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args)
+ : KWizard(parent)
  , m_args(args)
 {
 	setCaption(i18n("Import Database"));
diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h
index 95da22cdb..8d3a82b02 100644
--- a/kexi/migration/importwizard.h
+++ b/kexi/migration/importwizard.h
@@ -69,7 +69,7 @@ public:
 	 \a args contains arguments that can be parsed by parseArguments().
 	 \a *arg will be also set to imported project's filename on success
 	 and to null value on failure or cancellation. */
-	ImportWizard(TQWidget *tqparent = 0, TQMap<TQString,TQString>* args = 0);
+	ImportWizard(TQWidget *parent = 0, TQMap<TQString,TQString>* args = 0);
 	virtual ~ImportWizard();
 
 public slots:
diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp
index fc11d0cd1..b225f6ba1 100644
--- a/kexi/migration/keximigrate.cpp
+++ b/kexi/migration/keximigrate.cpp
@@ -33,9 +33,9 @@
 using namespace KexiDB;
 using namespace KexiMigration;
 
-KexiMigrate::KexiMigrate(TQObject *tqparent, const char *name,
+KexiMigrate::KexiMigrate(TQObject *parent, const char *name,
   const TQStringList&) 
-  : TQObject( tqparent, name )
+  : TQObject( parent, name )
   , m_migrateData(0)
   , m_destPrj(0)
 {
diff --git a/kexi/migration/keximigrate.h b/kexi/migration/keximigrate.h
index b897bd95b..ee22ded85 100644
--- a/kexi/migration/keximigrate.h
+++ b/kexi/migration/keximigrate.h
@@ -145,7 +145,7 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object
 
 	protected:
 		//! Used by MigrateManager.
-		KexiMigrate(TQObject *tqparent, const char *name, const TQStringList &args = TQStringList());
+		KexiMigrate(TQObject *parent, const char *name, const TQStringList &args = TQStringList());
 
 		//! Connect to source database (driver specific)
 		virtual bool drv_connect() = 0;
diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp
index 1ea152c66..1b125d8dc 100644
--- a/kexi/migration/mysql/mysqlmigrate.cpp
+++ b/kexi/migration/mysql/mysqlmigrate.cpp
@@ -52,9 +52,9 @@ KEXIMIGRATE_DRIVER_INFO( MySQLMigrate, mysql )
 }*/
 
 //! Constructor (needed for trading interface)
-MySQLMigrate::MySQLMigrate(TQObject *tqparent, const char *name,
+MySQLMigrate::MySQLMigrate(TQObject *parent, const char *name,
                            const TQStringList &args) :
-	KexiMigrate(tqparent, name, args)
+	KexiMigrate(parent, name, args)
 	,d(new MySqlConnectionInternal(0))
 	,m_mysqlres(0)
 {
diff --git a/kexi/migration/mysql/mysqlmigrate.h b/kexi/migration/mysql/mysqlmigrate.h
index e7627e76c..8f223ac5a 100644
--- a/kexi/migration/mysql/mysqlmigrate.h
+++ b/kexi/migration/mysql/mysqlmigrate.h
@@ -68,7 +68,7 @@ namespace KexiMigration
 
 		public:
 //			MySQLMigrate();
-			MySQLMigrate(TQObject *tqparent, const char *name, const TQStringList& args = TQStringList());
+			MySQLMigrate(TQObject *parent, const char *name, const TQStringList& args = TQStringList());
 			~MySQLMigrate();
 			
 			KexiDB::Field::Type type(const TQString& table, const MYSQL_FIELD* t);
diff --git a/kexi/migration/pqxx/pg_type.h b/kexi/migration/pqxx/pg_type.h
index a8b94f0a3..e0ead91ad 100644
--- a/kexi/migration/pqxx/pg_type.h
+++ b/kexi/migration/pqxx/pg_type.h
@@ -152,10 +152,10 @@
 //XX:XX:XX:XX:XX:XX, MAC address
 #define MACADDROID 		829
 
-//IP address/nettqmask, host address, nettqmask optional
+//IP address/netmask, host address, netmask optional
 #define INETOID 		869
 
-//network IP address/nettqmask, network address
+//network IP address/netmask, network address
 #define CIDROID 		650
 
 //access control list
diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp
index c01d68fda..d6c655f98 100644
--- a/kexi/migration/pqxx/pqxxmigrate.cpp
+++ b/kexi/migration/pqxx/pqxxmigrate.cpp
@@ -50,15 +50,15 @@ KEXIMIGRATE_DRIVER_INFO( PqxxMigrate, pqxx )
 //==================================================================================
 //Constructor
 /*PqxxMigrate::PqxxMigrate()
- : KexiMigrate(tqparent, name, args)
+ : KexiMigrate(parent, name, args)
 {
     m_res=0;
     m_trans=0;
     m_conn=0;
 }*/
 
-PqxxMigrate::PqxxMigrate(TQObject *tqparent, const char *name, const TQStringList &args)
- : KexiMigrate(tqparent, name, args)
+PqxxMigrate::PqxxMigrate(TQObject *parent, const char *name, const TQStringList &args)
+ : KexiMigrate(parent, name, args)
 {
     m_res=0;
     m_trans=0;
diff --git a/kexi/migration/pqxx/pqxxmigrate.h b/kexi/migration/pqxx/pqxxmigrate.h
index ee33c1386..6202c0db5 100644
--- a/kexi/migration/pqxx/pqxxmigrate.h
+++ b/kexi/migration/pqxx/pqxxmigrate.h
@@ -38,7 +38,7 @@ namespace KexiMigration
 		KEXIMIGRATION_DRIVER
 
 		public:
-			PqxxMigrate(TQObject *tqparent, const char *name, const TQStringList &args = TQStringList());
+			PqxxMigrate(TQObject *parent, const char *name, const TQStringList &args = TQStringList());
 			virtual ~PqxxMigrate();
 			
 		protected:
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index 9318bb5eb..615858407 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -51,18 +51,18 @@ typedef KListViewItemTemplate<TQString> ActionSelectorDialogListItemBase;
 class ActionSelectorDialogListItem : public ActionSelectorDialogListItemBase
 {
 public:
-	ActionSelectorDialogListItem(const TQString& data, TQListView *tqparent, TQString label1)
-	 : ActionSelectorDialogListItemBase(data, tqparent, label1)
+	ActionSelectorDialogListItem(const TQString& data, TQListView *parent, TQString label1)
+	 : ActionSelectorDialogListItemBase(data, parent, label1)
 	 , fifoSorting(true)
 	{
-		m_sortKey.sprintf("%2.2d", tqparent->childCount());
+		m_sortKey.sprintf("%2.2d", parent->childCount());
 	}
 
-	ActionSelectorDialogListItem(const TQString& data, TQListViewItem *tqparent, TQString label1)
-	 : ActionSelectorDialogListItemBase(data, tqparent, label1)
+	ActionSelectorDialogListItem(const TQString& data, TQListViewItem *parent, TQString label1)
+	 : ActionSelectorDialogListItemBase(data, parent, label1)
 	 , fifoSorting(true)
 	{
-		m_sortKey.sprintf("%2.2d", tqparent->childCount());
+		m_sortKey.sprintf("%2.2d", parent->childCount());
 	}
 
 	virtual TQString key( int column, bool ascending ) const
@@ -78,8 +78,8 @@ protected:
 
 //---------------------------------------
 
-ActionsListViewBase::ActionsListViewBase(TQWidget* tqparent)
- : KListView(tqparent)
+ActionsListViewBase::ActionsListViewBase(TQWidget* parent)
+ : KListView(parent)
 {
 	setResizeMode(TQListView::AllColumns);
 	addColumn("");
@@ -115,8 +115,8 @@ void ActionsListViewBase::selectAction(const TQString& actionName)
 
 //---------------------------------------
 
-KActionsListViewBase::KActionsListViewBase(TQWidget* tqparent, KexiMainWindow* mainWin)
-	: ActionsListViewBase(tqparent)
+KActionsListViewBase::KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin)
+	: ActionsListViewBase(parent)
 	, m_mainWin(mainWin)
 {
 }
@@ -156,8 +156,8 @@ void KActionsListViewBase::init()
 class KActionsListView : public KActionsListViewBase
 {
 public:
-	KActionsListView(TQWidget* tqparent, KexiMainWindow* mainWin)
-		: KActionsListViewBase(tqparent, mainWin)
+	KActionsListView(TQWidget* parent, KexiMainWindow* mainWin)
+		: KActionsListViewBase(parent, mainWin)
 	{
 	}
 	virtual ~KActionsListView() {}
@@ -172,8 +172,8 @@ public:
 class CurrentFormActionsListView : public KActionsListViewBase
 {
 public:
-	CurrentFormActionsListView(TQWidget* tqparent, KexiMainWindow* mainWin)
-		: KActionsListViewBase(tqparent, mainWin)
+	CurrentFormActionsListView(TQWidget* parent, KexiMainWindow* mainWin)
+		: KActionsListViewBase(parent, mainWin)
 	{
 	}
 	virtual ~CurrentFormActionsListView() {}
@@ -188,8 +188,8 @@ public:
 class ActionCategoriesListView : public ActionsListViewBase
 {
 public:
-	ActionCategoriesListView(TQWidget* tqparent) //, KexiProject& project)
-	 : ActionsListViewBase(tqparent)
+	ActionCategoriesListView(TQWidget* parent) //, KexiProject& project)
+	 : ActionsListViewBase(parent)
 	{
 		TQListViewItem *item = new ActionSelectorDialogListItem("noaction", this, i18n("No action") );
 		const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) );
@@ -243,8 +243,8 @@ public:
 class ActionToExecuteListView : public ActionsListViewBase
 {
 	public:
-		ActionToExecuteListView(TQWidget* tqparent)
-		 : ActionsListViewBase(tqparent)
+		ActionToExecuteListView(TQWidget* parent)
+		 : ActionsListViewBase(parent)
 		{
 		}
 
@@ -394,9 +394,9 @@ public:
 
 //-------------------------------------
 
-KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *tqparent, 
+KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *parent, 
 	const KexiFormEventAction::ActionData& action, const TQCString& actionWidgetName)
-	: KDialogBase(tqparent, "actionSelectorDialog", true, i18n("Assigning Action to Command Button"), 
+	: KDialogBase(parent, "actionSelectorDialog", true, i18n("Assigning Action to Command Button"), 
 		KDialogBase::Ok | KDialogBase::Cancel )
 	, d( new KexiActionSelectionDialogPrivate() )
 {
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.h b/kexi/plugins/forms/kexiactionselectiondialog.h
index a9c4d5498..a2c4066d4 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.h
+++ b/kexi/plugins/forms/kexiactionselectiondialog.h
@@ -39,7 +39,7 @@ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *tqparent, 
+		KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *parent, 
 			const KexiFormEventAction::ActionData& action, const TQCString& actionWidgetName);
 		~KexiActionSelectionDialog();
 
diff --git a/kexi/plugins/forms/kexiactionselectiondialog_p.h b/kexi/plugins/forms/kexiactionselectiondialog_p.h
index a25790741..488805ee3 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog_p.h
+++ b/kexi/plugins/forms/kexiactionselectiondialog_p.h
@@ -26,7 +26,7 @@
 class ActionsListViewBase : public KListView
 {
 	public:
-		ActionsListViewBase(TQWidget* tqparent);
+		ActionsListViewBase(TQWidget* parent);
 		virtual ~ActionsListViewBase();
 
 		//! \return item for action \a actionName
@@ -40,7 +40,7 @@ class KActionsListViewBase : public ActionsListViewBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KActionsListViewBase(TQWidget* tqparent, KexiMainWindow* mainWin);
+		KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin);
 		virtual ~KActionsListViewBase();
 		void init();
 		virtual bool isActionVisible(const char* actionName, int actionCategories) const = 0;
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 7e5b9b857..e89ba9cb7 100644
--- a/kexi/plugins/forms/kexidataprovider.cpp
+++ b/kexi/plugins/forms/kexidataprovider.cpp
@@ -64,7 +64,7 @@ void KexiFormDataProvider::setMainDataSourceWidget(TQWidget* mainWidget)
 		KexiFormDataItemInterface* const formDataItem = dynamic_cast<KexiFormDataItemInterface*>(obj);
 		if (!formDataItem)
 			continue;
-		if (formDataItem->parentInterface()) //item with tqparent interface: collect tqparent instead...
+		if (formDataItem->parentInterface()) //item with parent interface: collect parent instead...
 			continue;
 #if 0 //! @todo reenable when subform is moved to KexiDBForm
 		KexiDBForm *dbForm = KexiUtils::findParent<KexiDBForm>(obj, "KexiDBForm"); //form's surface...
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index 74f9af05a..e9ff41775 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -43,8 +43,8 @@
 #include <koproperty/property.h>
 #include <koproperty/utils.h>
 
-KexiDataSourcePage::KexiDataSourcePage(TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
  , m_insideClearDataSourceSelection(false)
 {
 	TQVBoxLayout *vlyr = new TQVBoxLayout(this);
diff --git a/kexi/plugins/forms/kexidatasourcepage.h b/kexi/plugins/forms/kexidatasourcepage.h
index 914a869be..748d5d3db 100644
--- a/kexi/plugins/forms/kexidatasourcepage.h
+++ b/kexi/plugins/forms/kexidatasourcepage.h
@@ -41,7 +41,7 @@ class KEXIFORMUTILS_EXPORT KexiDataSourcePage : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiDataSourcePage(TQWidget *tqparent, const char *name = 0);
+		KexiDataSourcePage(TQWidget *parent, const char *name = 0);
 		virtual ~KexiDataSourcePage();
 
 		KexiDataSourceComboBox* dataSourceCombo() const { return m_dataSourceCombo; }
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 8683c2bb7..89f8ae111 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -69,8 +69,8 @@
 
 //////////////////////////////////////////
 
-KexiDBFactory::KexiDBFactory(TQObject *tqparent, const char *name, const TQStringList &)
- : KFormDesigner::WidgetFactory(tqparent, name)
+KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringList &)
+ : KFormDesigner::WidgetFactory(parent, name)
 {
 	KFormDesigner::WidgetInfo *wi;
 	wi = new KexiDataAwareWidgetInfo(this);
diff --git a/kexi/plugins/forms/kexidbfactory.h b/kexi/plugins/forms/kexidbfactory.h
index 79873b726..67ee3527e 100644
--- a/kexi/plugins/forms/kexidbfactory.h
+++ b/kexi/plugins/forms/kexidbfactory.h
@@ -37,10 +37,10 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory
   TQ_OBJECT
 
 	public:
-		KexiDBFactory(TQObject *tqparent, const char *name, const TQStringList &args);
+		KexiDBFactory(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~KexiDBFactory();
 
-		virtual TQWidget *createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, 
+		virtual TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, 
 			KFormDesigner::Container *container, int options = DefaultOptions );
 
 		virtual void createCustomActions(KActionCollection* col);
@@ -51,7 +51,7 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory
 		virtual bool clearWidgetContent(const TQCString &classname, TQWidget *w);
 
 		//virtual void		saveSpecialProperty(const TQString &classname, const TQString &name, const TQVariant &value, TQWidget *w,
-		         //TQDomElement &parentNode, TQDomDocument &tqparent) {}
+		         //TQDomElement &parentNode, TQDomDocument &parent) {}
 		//virtual void            readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item) {}
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
 
diff --git a/kexi/plugins/forms/kexiformdataiteminterface.h b/kexi/plugins/forms/kexiformdataiteminterface.h
index 1cb7a11f4..a1d41482c 100644
--- a/kexi/plugins/forms/kexiformdataiteminterface.h
+++ b/kexi/plugins/forms/kexiformdataiteminterface.h
@@ -118,7 +118,7 @@ class KEXIFORMUTILS_EXPORT KexiFormDataItemInterface : public KexiDataItemInterf
 		virtual void undoChanges();
 
 		/* Cancels editing of the widget's data. This method just looks for 
-		 the (grand)tqparent KexiFormScrollView object and calls
+		 the (grand)parent KexiFormScrollView object and calls
 		 KexiFormScrollView::cancelEditor(). */
 		void cancelEditor();
 
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index cd6f5ac31..4e066bd65 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -68,9 +68,9 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString(
 
 //-------------------------------------
 
-KexiFormEventAction::KexiFormEventAction(KexiMainWindow *mainWin, TQObject* tqparent, 
+KexiFormEventAction::KexiFormEventAction(KexiMainWindow *mainWin, TQObject* parent, 
 	const TQString& actionName, const TQString& objectName, const TQString& actionOption)
- : KAction(tqparent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName)
+ : KAction(parent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName)
  , m_actionOption(actionOption)
 {
 }
@@ -94,7 +94,7 @@ void KexiFormEventAction::activate()
 	bool actionCancelled = false;
 	if (m_actionOption.isEmpty()) { // backward compatibility (good defaults)
 		if (part->info()->isExecuteSupported())
-			part->execute(item, tqparent());
+			part->execute(item, parent());
 		else
 			m_mainWin->openObject(item, Kexi::DataViewMode, actionCancelled);
 	}
@@ -103,7 +103,7 @@ void KexiFormEventAction::activate()
 		if (m_actionOption == "open")
 			m_mainWin->openObject(item, Kexi::DataViewMode, actionCancelled);
 		else if (m_actionOption == "execute")
-			part->execute(item, tqparent());
+			part->execute(item, parent());
 		else if (m_actionOption == "print") {
 			if (part->info()->isPrintingSupported())
 				m_mainWin->printItem(item);
diff --git a/kexi/plugins/forms/kexiformeventhandler.h b/kexi/plugins/forms/kexiformeventhandler.h
index 6e020e25f..e882eeb84 100644
--- a/kexi/plugins/forms/kexiformeventhandler.h
+++ b/kexi/plugins/forms/kexiformeventhandler.h
@@ -84,7 +84,7 @@ class KEXIFORMUTILS_EXPORT KexiFormEventAction : public KAction
 				                //!< @see ActionToExecuteListView::showActionsForMimeType()
 		};
 
-		KexiFormEventAction(KexiMainWindow *mainWin, TQObject* tqparent, const TQString& actionName, 
+		KexiFormEventAction(KexiMainWindow *mainWin, TQObject* parent, const TQString& actionName, 
 			const TQString& objectName, const TQString& actionOption);
 		virtual ~KexiFormEventAction();
 
diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp
index 3c76e7d9d..9674f4fe9 100644
--- a/kexi/plugins/forms/kexiformmanager.cpp
+++ b/kexi/plugins/forms/kexiformmanager.cpp
@@ -35,13 +35,13 @@
 #include <koproperty/property.h>
 #include <widget/kexicustompropertyfactory.h>
 
-KexiFormManager::KexiFormManager(KexiPart::Part *tqparent, const char* name)
- : KFormDesigner::FormManager(tqparent, 
+KexiFormManager::KexiFormManager(KexiPart::Part *parent, const char* name)
+ : KFormDesigner::FormManager(parent, 
 		KFormDesigner::FormManager::HideEventsInPopupMenu |
 		KFormDesigner::FormManager::SkipFileActions |
 		KFormDesigner::FormManager::HideSignalSlotConnections
 	, name)
- , m_part(tqparent)
+ , m_part(parent)
 {
 	m_emitSelectionSignalsUpdatesPropertySet = true;
 	KexiCustomPropertyFactory::init();
@@ -67,7 +67,7 @@ KAction* KexiFormManager::action( const char* name )
 	KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject());
 	if (!scrollViewWidget)
 		return 0;
-	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent());
+	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->parent());
 	if (!formViewWidget)
 		return 0;
 	return formViewWidget->parentDialog()->mainWin()->actionCollection()->action(n.data());
@@ -82,7 +82,7 @@ KexiFormView* KexiFormManager::activeFormViewWidget() const
 	KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject());
 	if (!scrollViewWidget)
 		return 0;
-	return dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent());
+	return dynamic_cast<KexiFormView*>(scrollViewWidget->parent());
 }
 
 void KexiFormManager::enableAction( const char* name, bool enable )
diff --git a/kexi/plugins/forms/kexiformmanager.h b/kexi/plugins/forms/kexiformmanager.h
index 34decc1d5..6cde85dc7 100644
--- a/kexi/plugins/forms/kexiformmanager.h
+++ b/kexi/plugins/forms/kexiformmanager.h
@@ -34,7 +34,7 @@ class KEXIFORMUTILS_EXPORT KexiFormManager : public KFormDesigner::FormManager
   TQ_OBJECT
 
 	public:
-		KexiFormManager(KexiPart::Part *tqparent, const char* name = 0);
+		KexiFormManager(KexiPart::Part *parent, const char* name = 0);
 		virtual ~KexiFormManager();
 
 		virtual KAction* action( const char* name );
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index e03a07791..9c4e3173d 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -77,8 +77,8 @@ class KexiFormPart::Private
 		KexiDataSourceComboBox *dataSourceCombo;
 };
 
-KexiFormPart::KexiFormPart(TQObject *tqparent, const char *name, const TQStringList &l)
- : KexiPart::Part(tqparent, name, l)
+KexiFormPart::KexiFormPart(TQObject *parent, const char *name, const TQStringList &l)
+ : KexiPart::Part(parent, name, l)
  , d(new Private())
 {
 	// REGISTERED ID:
@@ -233,7 +233,7 @@ KexiFormPart::createTempData(KexiDialogBase* dialog)
 	return new KexiFormPart::TempData(TQT_TQOBJECT(dialog));
 }
 
-KexiViewBase* KexiFormPart::createView(TQWidget *tqparent, KexiDialogBase* dialog,
+KexiViewBase* KexiFormPart::createView(TQWidget *parent, KexiDialogBase* dialog,
 	KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*)
 {
 	Q_UNUSED( viewMode );
@@ -243,7 +243,7 @@ KexiViewBase* KexiFormPart::createView(TQWidget *tqparent, KexiDialogBase* dialo
 	if (!win || !win->project() || !win->project()->dbConnection())
 		return 0;
 
-	KexiFormView *view = new KexiFormView(win, tqparent, item.name().latin1(),
+	KexiFormView *view = new KexiFormView(win, parent, item.name().latin1(),
 		win->project()->dbConnection() );
 
 	return view;
@@ -424,7 +424,7 @@ void KexiFormPart::slotAssignAction()
 	KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject());
 	if (!scrollViewWidget)
 		return;
-	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent());
+	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->parent());
 	if (!formViewWidget)
 		return;
 
@@ -538,8 +538,8 @@ void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget)
 
 //----------------
 
-KexiFormPart::TempData::TempData(TQObject* tqparent)
- : KexiDialogTempData(tqparent)
+KexiFormPart::TempData::TempData(TQObject* parent)
+ : KexiDialogTempData(parent)
 {
 }
 
diff --git a/kexi/plugins/forms/kexiformpart.h b/kexi/plugins/forms/kexiformpart.h
index df5c6b534..fe6670615 100644
--- a/kexi/plugins/forms/kexiformpart.h
+++ b/kexi/plugins/forms/kexiformpart.h
@@ -52,7 +52,7 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part
   TQ_OBJECT
 
 	public:
-		KexiFormPart(TQObject *tqparent, const char *name, const TQStringList &);
+		KexiFormPart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~KexiFormPart();
 
 		//! \return a pointer to Forms Widget Library.
@@ -65,7 +65,7 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part
 		class TempData : public KexiDialogTempData
 		{
 			public:
-				TempData(TQObject* tqparent);
+				TempData(TQObject* parent);
 				~TempData();
 				TQGuardedPtr<KFormDesigner::Form> form;
 				TQGuardedPtr<KFormDesigner::Form> previewForm;
@@ -85,7 +85,7 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part
 	protected:
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog,
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog,
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
 		virtual void initPartActions();
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index 5996061ff..df5191ed7 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -30,8 +30,8 @@
 #include <kpopupmenu.h>
 #include <kdebug.h>
 
-KexiFormScrollView::KexiFormScrollView(TQWidget *tqparent, bool preview)
- : KexiScrollView(tqparent, preview)
+KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview)
+ : KexiScrollView(parent, preview)
  , KexiRecordNavigatorHandler()
  , KexiSharedActionClient()
  , KexiDataAwareObjectInterface()
@@ -71,7 +71,7 @@ KexiFormScrollView::show()
 #if 0 //moved to KexiFormView, OK?
 	//now get resize mode settings for entire form
 	if (m_preview) {
-		KexiFormView* fv = dynamic_cast<KexiFormView*>(tqparent());
+		KexiFormView* fv = dynamic_cast<KexiFormView*>(parent());
 		int resizeMode = fv ? fv->resizeMode() : KexiFormView::ResizeAuto;
 		if (resizeMode == KexiFormView::ResizeAuto)
 			setResizePolicy(AutoOneFit);
diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h
index 61c13a8f7..d8326a570 100644
--- a/kexi/plugins/forms/kexiformscrollview.h
+++ b/kexi/plugins/forms/kexiformscrollview.h
@@ -51,7 +51,7 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView :
 	KEXI_DATAAWAREOBJECTINTERFACE
 
 	public:
-		KexiFormScrollView(TQWidget *tqparent, bool preview);
+		KexiFormScrollView(TQWidget *parent, bool preview);
 		virtual ~KexiFormScrollView();
 
 		void setForm(KFormDesigner::Form *form) { m_form = form; }
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 3b12588cc..01ec080f7 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -60,9 +60,9 @@
 
 //! @todo #define KEXI_SHOW_SPLITTER_WIDGET
 
-KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent,
+KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent,
 	const char *name, bool /*dbAware*/)
- : KexiDataAwareView( mainWin, tqparent, name )
+ : KexiDataAwareView( mainWin, parent, name )
  , m_propertySet(0)
  , m_resizeMode(KexiFormView::ResizeDefault)
  , m_query(0)
diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h
index b05a544c7..8bc1cb79d 100644
--- a/kexi/plugins/forms/kexiformview.h
+++ b/kexi/plugins/forms/kexiformview.h
@@ -65,8 +65,8 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 			NoResize = 2 /*! @todo */
 		};
 
-//		KexiFormView(KexiMainWindow *win, TQWidget *tqparent, const char *name, KexiDB::Connection *conn);
-		KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0,
+//		KexiFormView(KexiMainWindow *win, TQWidget *parent, const char *name, KexiDB::Connection *conn);
+		KexiFormView(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0,
 			bool dbAware = true);
 		virtual ~KexiFormView();
 
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 521dce2a3..7ebc522f6 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -72,8 +72,8 @@ class KexiDBAutoField::Private
 //-------------------------------------
 
 KexiDBAutoField::KexiDBAutoField(const TQString &text, WidgetType type, LabelPosition pos, 
-	TQWidget *tqparent, const char *name, bool designMode)
- : TQWidget(tqparent, name)
+	TQWidget *parent, const char *name, bool designMode)
+ : TQWidget(parent, name)
  , KexiFormDataItemInterface()
  , KFormDesigner::DesignTimeDynamicChildWidgetHandler()
  , d( new Private() )
@@ -82,8 +82,8 @@ KexiDBAutoField::KexiDBAutoField(const TQString &text, WidgetType type, LabelPos
 	init(text, type, pos);
 }
 
-KexiDBAutoField::KexiDBAutoField(TQWidget *tqparent, const char *name, bool designMode, LabelPosition pos)
- : TQWidget(tqparent, name)
+KexiDBAutoField::KexiDBAutoField(TQWidget *parent, const char *name, bool designMode, LabelPosition pos)
+ : TQWidget(parent, name)
  , KexiFormDataItemInterface()
  , KFormDesigner::DesignTimeDynamicChildWidgetHandler()
  , d( new Private() )
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.h b/kexi/plugins/forms/widgets/kexidbautofield.h
index f13e701e8..653e4067b 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.h
+++ b/kexi/plugins/forms/widgets/kexidbautofield.h
@@ -64,8 +64,8 @@ class KEXIFORMUTILS_EXPORT KexiDBAutoField :
 		enum LabelPosition { Left = 300, Top, NoLabel };
 
 		KexiDBAutoField(const TQString &text, WidgetType type, LabelPosition pos, 
-			TQWidget *tqparent = 0, const char *name = 0, bool designMode = true);
-		KexiDBAutoField(TQWidget *tqparent = 0, const char *name = 0, bool designMode = true,
+			TQWidget *parent = 0, const char *name = 0, bool designMode = true);
+		KexiDBAutoField(TQWidget *parent = 0, const char *name = 0, bool designMode = true,
 			LabelPosition pos = Left);
 
 		virtual ~KexiDBAutoField();
diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
index c704a985f..c1a8f5d4d 100644
--- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
@@ -23,8 +23,8 @@
 #include <kexiutils/utils.h>
 #include <kexidb/queryschema.h>
 
-KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *tqparent, const char *name)
- : TQCheckBox(text, tqparent, name), KexiFormDataItemInterface()
+KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *parent, const char *name)
+ : TQCheckBox(text, parent, name), KexiFormDataItemInterface()
  , m_invalidState(false)
  , m_tristateChanged(false)
  , m_tristate(TristateDefault)
diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.h b/kexi/plugins/forms/widgets/kexidbcheckbox.h
index 8a65f33a0..aba3314c4 100644
--- a/kexi/plugins/forms/widgets/kexidbcheckbox.h
+++ b/kexi/plugins/forms/widgets/kexidbcheckbox.h
@@ -35,7 +35,7 @@ class KEXIFORMUTILS_EXPORT KexiDBCheckBox : public TQCheckBox, public KexiFormDa
 	Q_ENUMS( Tristate )
 
 	public:
-		KexiDBCheckBox(const TQString &text, TQWidget *tqparent, const char *name=0);
+		KexiDBCheckBox(const TQString &text, TQWidget *parent, const char *name=0);
 		virtual ~KexiDBCheckBox();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index f194908f7..81c66ba6b 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -72,8 +72,8 @@ class KexiDBComboBox::Private
 
 //-------------------------------------
 
-KexiDBComboBox::KexiDBComboBox(TQWidget *tqparent, const char *name, bool designMode)
- : KexiDBAutoField(tqparent, name, designMode, NoLabel)
+KexiDBComboBox::KexiDBComboBox(TQWidget *parent, const char *name, bool designMode)
+ : KexiDBAutoField(parent, name, designMode, NoLabel)
  , KexiComboBoxBase()
  , d(new Private())
 {
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.h b/kexi/plugins/forms/widgets/kexidbcombobox.h
index 2639b1f96..4e780aa35 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.h
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.h
@@ -44,7 +44,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 	TQ_OVERRIDE(bool autoCaption DESIGNABLE false)
 
 	public:
-		KexiDBComboBox(TQWidget *tqparent, const char *name=0, bool designMode = true);
+		KexiDBComboBox(TQWidget *parent, const char *name=0, bool designMode = true);
 		virtual ~KexiDBComboBox();
 
 		//! Implemented for KexiComboBoxBase: form has no 'related data' model (only the full database model)
@@ -147,7 +147,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 		//! Implemented for KexiComboBoxBase
 		virtual void acceptRequested();
 
-		//! Implement this to return a position \a pos mapped from tqparent (e.g. viewport) 
+		//! Implement this to return a position \a pos mapped from parent (e.g. viewport) 
 		//! to global coordinates. TQPoint(-1, -1) should be returned if this cannot be computed.
 		virtual TQPoint mapFromParentToGlobal(const TQPoint& pos) const;
 
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index 9638f93ab..8394ef58f 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -28,8 +28,8 @@
 #include <kexiutils/utils.h>
 #include <kexidb/queryschema.h>
 
-KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name), KexiFormDataItemInterface()
+KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char *name)
+ : TQWidget(parent, name), KexiFormDataItemInterface()
 {
 	m_invalidState = false;
 	m_cleared = false;
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.h b/kexi/plugins/forms/widgets/kexidbdateedit.h
index b611590e1..4b02a3bcb 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.h
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.h
@@ -47,7 +47,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateEdit : public TQWidget, public KexiFormData
 	public:
 		enum Order { DMY = TQDateEdit::DMY, MDY = TQDateEdit::MDY, YMD = TQDateEdit::YMD,  YDM = TQDateEdit::YDM };
 
-		KexiDBDateEdit(const TQDate &date, TQWidget *tqparent, const char *name=0);
+		KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char *name=0);
 		virtual ~KexiDBDateEdit();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index e99e46518..ea9dede77 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -27,8 +27,8 @@
 #include <kdatetbl.h>
 #include <kexiutils/utils.h>
 
-KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name), KexiFormDataItemInterface()
+KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *parent, const char *name)
+ : TQWidget(parent, name), KexiFormDataItemInterface()
 {
 	m_invalidState = false;
 	m_cleared = false;
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h
index b5bbaec01..b28ff0693 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h
@@ -42,7 +42,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateTimeEdit : public TQWidget, public KexiForm
 	public:
 		enum Order { DMY, MDY, YMD, YDM };
 
-		KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *tqparent, const char *name=0);
+		KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *parent, const char *name=0);
 		virtual ~KexiDBDateTimeEdit();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
index c0eb17d33..99afcbd6c 100644
--- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
@@ -22,8 +22,8 @@
 
 #include <tqlineedit.h>
 
-KexiDBDoubleSpinBox::KexiDBDoubleSpinBox(TQWidget *tqparent, const char *name)
- : KDoubleSpinBox(tqparent, name) , KexiFormDataItemInterface()
+KexiDBDoubleSpinBox::KexiDBDoubleSpinBox(TQWidget *parent, const char *name)
+ : KDoubleSpinBox(parent, name) , KexiFormDataItemInterface()
 {
 	connect(this, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotValueChanged()));
 }
diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.h b/kexi/plugins/forms/widgets/kexidbdoublespinbox.h
index 1445980c8..e693245be 100644
--- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.h
+++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.h
@@ -35,7 +35,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDoubleSpinBox : public KDoubleSpinBox, public K
 	TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true )
 
 	public:
-		KexiDBDoubleSpinBox(TQWidget *tqparent, const char *name=0);
+		KexiDBDoubleSpinBox(TQWidget *parent, const char *name=0);
 		virtual ~KexiDBDoubleSpinBox();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index c2a705c08..88ddf93fa 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -100,9 +100,9 @@ class KexiDBForm::Private
 
 //========================
 
-KexiDBForm::KexiDBForm(TQWidget *tqparent, KexiDataAwareObjectInterface* dataAwareObject, 
+KexiDBForm::KexiDBForm(TQWidget *parent, KexiDataAwareObjectInterface* dataAwareObject, 
 	const char *name/*, KexiDB::Connection *conn*/)
- : KexiDBFormBase(tqparent, name)
+ : KexiDBFormBase(parent, name)
  , KexiFormDataItemInterface()
  , d(new Private())
 {
@@ -425,11 +425,11 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 						while (dataItemIface) {
 							if (dataItemIface->keyPressed(ke))
 								return false;
-							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in tqparent, e.g. in combobox
+							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in parent, e.g. in combobox
 						}
 						break;
 					}
-					o = o->tqparent();
+					o = o->parent();
 				}
 				// try to handle global shortcuts at the KexiDataAwareObjectInterface 
 				// level (e.g. for "next record" action)
diff --git a/kexi/plugins/forms/widgets/kexidbform.h b/kexi/plugins/forms/widgets/kexidbform.h
index cbfdc8eed..fc0d25c27 100644
--- a/kexi/plugins/forms/widgets/kexidbform.h
+++ b/kexi/plugins/forms/widgets/kexidbform.h
@@ -50,7 +50,7 @@ class KEXIFORMUTILS_EXPORT KexiDBForm :
 	//original "size" property is not designable, so here's a custom (not storable) replacement
 	TQ_PROPERTY( TQSize sizeInternal READ sizeInternal WRITE resizeInternal DESIGNABLE true STORED false )
 	public:
-		KexiDBForm(TQWidget *tqparent, KexiDataAwareObjectInterface* dataAwareObject, const char *name="kexi_dbform");
+		KexiDBForm(TQWidget *parent, KexiDataAwareObjectInterface* dataAwareObject, const char *name="kexi_dbform");
 		virtual ~KexiDBForm();
 
 		KexiDataAwareObjectInterface* dataAwareObject() const;
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 0e79fada1..4165c0000 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -64,8 +64,8 @@ static TQPixmap* KexiDBImageBox_pm = 0;
 static KStaticDeleter<TQPixmap> KexiDBImageBox_pmSmallDeleter;
 static TQPixmap* KexiDBImageBox_pmSmall = 0;
 
-KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *tqparent, const char *name )
-	: KexiFrame( tqparent, name, TQt::WNoAutoErase )
+KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *name )
+	: KexiFrame( parent, name, TQt::WNoAutoErase )
 	, KexiFormDataItemInterface()
 	, m_tqalignment(TQt::AlignAuto|TQt::AlignTop)
 	, m_designMode(designMode)
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h
index 85b54cd58..32b4e9b15 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.h
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.h
@@ -56,7 +56,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 	TQ_OVERRIDE( FocusPolicy focusPolicy READ focusPolicyInternal WRITE setFocusPolicy )
 
 	public:
-		KexiDBImageBox( bool designMode, TQWidget *tqparent, const char *name = 0 );
+		KexiDBImageBox( bool designMode, TQWidget *parent, const char *name = 0 );
 		virtual ~KexiDBImageBox();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
index 7d5ae6ee3..a48d06c80 100644
--- a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
@@ -23,8 +23,8 @@
 #include <tqlineedit.h>
 #include <knumvalidator.h>
 
-KexiDBIntSpinBox::KexiDBIntSpinBox(TQWidget *tqparent, const char *name)
- : KIntSpinBox(tqparent, name) , KexiFormDataItemInterface()
+KexiDBIntSpinBox::KexiDBIntSpinBox(TQWidget *parent, const char *name)
+ : KIntSpinBox(parent, name) , KexiFormDataItemInterface()
 {
 	connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged()));
 }
diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.h b/kexi/plugins/forms/widgets/kexidbintspinbox.h
index 9827cd5fd..a76ab0ddd 100644
--- a/kexi/plugins/forms/widgets/kexidbintspinbox.h
+++ b/kexi/plugins/forms/widgets/kexidbintspinbox.h
@@ -35,7 +35,7 @@ class KEXIFORMUTILS_EXPORT KexiDBIntSpinBox : public KIntSpinBox, public KexiFor
 	TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true )
 
 	public:
-		KexiDBIntSpinBox(TQWidget *tqparent, const char *name=0);
+		KexiDBIntSpinBox(TQWidget *parent, const char *name=0);
 		virtual ~KexiDBIntSpinBox();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index 8226d3c47..0fc3525c5 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -59,9 +59,9 @@ class KexiDBInternalLabel : public TQLabel {
 		KexiDBLabel *m_parentLabel;
 };
 
-KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* tqparent )
-	: TQLabel( tqparent )
-	, m_parentLabel(tqparent)
+KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* parent )
+	: TQLabel( parent )
+	, m_parentLabel(parent)
 {
 	int a = tqalignment() | TQt::WordBreak;
 	a &= (0xffffff ^ TQt::AlignVertical_Mask);
@@ -395,8 +395,8 @@ class KexiDBLabel::Private
 
 //=========================================================
 
-KexiDBLabel::KexiDBLabel( TQWidget *tqparent, const char *name, WFlags f )
-	: TQLabel( tqparent, name, f )
+KexiDBLabel::KexiDBLabel( TQWidget *parent, const char *name, WFlags f )
+	: TQLabel( parent, name, f )
 	, KexiDBTextWidgetInterface()
 	, KexiFormDataItemInterface()
 	, d( new Private() )
@@ -404,8 +404,8 @@ KexiDBLabel::KexiDBLabel( TQWidget *tqparent, const char *name, WFlags f )
 	init();
 }
 
-KexiDBLabel::KexiDBLabel( const TQString& text, TQWidget *tqparent, const char *name, WFlags f )
-	: TQLabel( tqparent, name, f )
+KexiDBLabel::KexiDBLabel( const TQString& text, TQWidget *parent, const char *name, WFlags f )
+	: TQLabel( parent, name, f )
 	, KexiDBTextWidgetInterface()
 	, KexiFormDataItemInterface()
 	, d( new Private() )
diff --git a/kexi/plugins/forms/widgets/kexidblabel.h b/kexi/plugins/forms/widgets/kexidblabel.h
index af396a127..f99ddc769 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.h
+++ b/kexi/plugins/forms/widgets/kexidblabel.h
@@ -51,8 +51,8 @@ class KEXIFORMUTILS_EXPORT KexiDBLabel : public TQLabel, protected KexiDBTextWid
 		TQ_PROPERTY( TQColor frameColor READ frameColor WRITE setFrameColor DESIGNABLE true )
 
 	public:
-		KexiDBLabel( TQWidget *tqparent, const char *name = 0, WFlags f = 0 );
-		KexiDBLabel( const TQString& text, TQWidget *tqparent, const char *name = 0, WFlags f = 0 );
+		KexiDBLabel( TQWidget *parent, const char *name = 0, WFlags f = 0 );
+		KexiDBLabel( const TQString& text, TQWidget *parent, const char *name = 0, WFlags f = 0 );
 		virtual ~KexiDBLabel();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index 0b1709e11..5bb74e22a 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -40,8 +40,8 @@
 class KexiDBLineEdit_ReadOnlyValidator : public TQValidator
 {
 	public:
-		KexiDBLineEdit_ReadOnlyValidator( TQObject * tqparent ) 
-		 : TQValidator(tqparent)
+		KexiDBLineEdit_ReadOnlyValidator( TQObject * parent ) 
+		 : TQValidator(parent)
 		{
 		}
 		~KexiDBLineEdit_ReadOnlyValidator() {}
@@ -50,8 +50,8 @@ class KexiDBLineEdit_ReadOnlyValidator : public TQValidator
 
 //-----
 
-KexiDBLineEdit::KexiDBLineEdit(TQWidget *tqparent, const char *name)
- : KLineEdit(tqparent, name)
+KexiDBLineEdit::KexiDBLineEdit(TQWidget *parent, const char *name)
+ : KLineEdit(parent, name)
  , KexiDBTextWidgetInterface()
  , KexiFormDataItemInterface()
 //moved , m_dateFormatter(0)
@@ -303,7 +303,7 @@ void KexiDBLineEdit::setColumnInfo(KexiDB::QueryColumnInfo* cinfo)
 	if (!cinfo)
 		return;
 
-//! @todo handle input tqmask (via TQLineEdit::setInputMask()) using a special KexiDB::FieldInputMask class
+//! @todo handle input mask (via TQLineEdit::setInputMask()) using a special KexiDB::FieldInputMask class
 	setValidator( new KexiDB::FieldValidator(*cinfo->field, this) );
 
 #if 0 // moved to KexiTextFormatter
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.h b/kexi/plugins/forms/widgets/kexidblineedit.h
index 92a87280d..9d85dac52 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.h
+++ b/kexi/plugins/forms/widgets/kexidblineedit.h
@@ -53,7 +53,7 @@ class KEXIFORMUTILS_EXPORT KexiDBLineEdit :
 	TQ_OVERRIDE(bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true)
 
 	public:
-		KexiDBLineEdit(TQWidget *tqparent, const char *name=0);
+		KexiDBLineEdit(TQWidget *parent, const char *name=0);
 		virtual ~KexiDBLineEdit();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 283631c39..9c24df4a9 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp
@@ -29,8 +29,8 @@
 #include <formeditor/container.h>
 #include <formeditor/formmanager.h>
 
-KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_parentForm(parentForm), m_form(0), m_widget(0)
+KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *parent, const char *name)
+: TQScrollView(parent, name), m_parentForm(parentForm), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.h b/kexi/plugins/forms/widgets/kexidbsubform.h
index cbbc6250a..c09e5e835 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.h
+++ b/kexi/plugins/forms/widgets/kexidbsubform.h
@@ -32,7 +32,7 @@ class KEXIFORMUTILS_EXPORT KexiDBSubForm : public TQScrollView
 	TQ_PROPERTY(TQString formName READ formName WRITE setFormName DESIGNABLE true)
 
 	public:
-		KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name);
+		KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *parent, const char *name);
 		~KexiDBSubForm() {}
 
 		//! \return the name of the subform to display inside this widget
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index 6f6aa89da..c4cbe4d04 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -28,8 +28,8 @@
 
 #include <tqpainter.h>
 
-KexiDBTextEdit::KexiDBTextEdit(TQWidget *tqparent, const char *name)
- : KTextEdit(tqparent, name)
+KexiDBTextEdit::KexiDBTextEdit(TQWidget *parent, const char *name)
+ : KTextEdit(parent, name)
  , KexiDBTextWidgetInterface()
  , KexiFormDataItemInterface()
  , m_menuExtender(TQT_TQOBJECT(this), this)
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.h b/kexi/plugins/forms/widgets/kexidbtextedit.h
index c6f64136e..8e92ee6f9 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.h
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.h
@@ -38,7 +38,7 @@ class KEXIFORMUTILS_EXPORT KexiDBTextEdit :
 	TQ_PROPERTY(TQCString dataSourceMimeType READ dataSourceMimeType WRITE setDataSourceMimeType DESIGNABLE true)
 
 	public:
-		KexiDBTextEdit(TQWidget *tqparent, const char *name=0);
+		KexiDBTextEdit(TQWidget *parent, const char *name=0);
 		virtual ~KexiDBTextEdit();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
index f2546a440..b136fa0d8 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
@@ -29,8 +29,8 @@
 #include <kdatetbl.h>
 #include <kexiutils/utils.h>
 
-KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *tqparent, const char *name)
- : TQTimeEdit(time, tqparent, name), KexiFormDataItemInterface()
+KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *parent, const char *name)
+ : TQTimeEdit(time, parent, name), KexiFormDataItemInterface()
 {
 	m_invalidState = false;
 	setAutoAdvance(true);
diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.h b/kexi/plugins/forms/widgets/kexidbtimeedit.h
index 6b29a7acb..808316e6f 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.h
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.h
@@ -37,7 +37,7 @@ class KEXIFORMUTILS_EXPORT KexiDBTimeEdit : public TQTimeEdit, public KexiFormDa
 	TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true )
 
 	public:
-		KexiDBTimeEdit(const TQTime &time, TQWidget *tqparent, const char *name=0);
+		KexiDBTimeEdit(const TQTime &time, TQWidget *parent, const char *name=0);
 		virtual ~KexiDBTimeEdit();
 
 		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
diff --git a/kexi/plugins/forms/widgets/kexidbutils.cpp b/kexi/plugins/forms/widgets/kexidbutils.cpp
index ba9f2aec0..3f12b3dd1 100644
--- a/kexi/plugins/forms/widgets/kexidbutils.cpp
+++ b/kexi/plugins/forms/widgets/kexidbutils.cpp
@@ -37,8 +37,8 @@ TQColor lighterGrayBackgroundColor(const TQPalette& palette)
 
 //-------
 
-KexiDBWidgetContextMenuExtender::KexiDBWidgetContextMenuExtender( TQObject* tqparent, KexiDataItemInterface* iface )
- : TQObject(tqparent)
+KexiDBWidgetContextMenuExtender::KexiDBWidgetContextMenuExtender( TQObject* parent, KexiDataItemInterface* iface )
+ : TQObject(parent)
  , m_iface(iface)
  , m_contextMenuHasTitle(false)
 {
diff --git a/kexi/plugins/forms/widgets/kexidbutils.h b/kexi/plugins/forms/widgets/kexidbutils.h
index 06f49406b..f4100c73b 100644
--- a/kexi/plugins/forms/widgets/kexidbutils.h
+++ b/kexi/plugins/forms/widgets/kexidbutils.h
@@ -31,7 +31,7 @@ TQColor lighterGrayBackgroundColor(const TQPalette& palette);
 class KexiDBWidgetContextMenuExtender : public TQObject
 {
 	public:
-		KexiDBWidgetContextMenuExtender( TQObject* tqparent, KexiDataItemInterface* iface );
+		KexiDBWidgetContextMenuExtender( TQObject* parent, KexiDataItemInterface* iface );
 		~KexiDBWidgetContextMenuExtender();
 
 		//! Creates title for context menu \a menu
diff --git a/kexi/plugins/forms/widgets/kexiframe.cpp b/kexi/plugins/forms/widgets/kexiframe.cpp
index b33581d7e..09266ae41 100644
--- a/kexi/plugins/forms/widgets/kexiframe.cpp
+++ b/kexi/plugins/forms/widgets/kexiframe.cpp
@@ -43,8 +43,8 @@ class KexiFrame::Private
 
 //=========================================================
 
-KexiFrame::KexiFrame( TQWidget * tqparent, const char * name, WFlags f )
-	: TQFrame(tqparent, name, f)
+KexiFrame::KexiFrame( TQWidget * parent, const char * name, WFlags f )
+	: TQFrame(parent, name, f)
 	, d( new Private() )
 {
 	//defaults
diff --git a/kexi/plugins/forms/widgets/kexiframe.h b/kexi/plugins/forms/widgets/kexiframe.h
index d960cefdf..2f6ca562f 100644
--- a/kexi/plugins/forms/widgets/kexiframe.h
+++ b/kexi/plugins/forms/widgets/kexiframe.h
@@ -33,7 +33,7 @@ class KEXIFORMUTILS_EXPORT KexiFrame : public TQFrame
 //todo	TQ_OVERRIDE( Shadow frameShadow READ frameShadow WRITE setFrameShadow )
 
 	public:
-		KexiFrame( TQWidget * tqparent, const char * name = 0, WFlags f = 0 );
+		KexiFrame( TQWidget * parent, const char * name = 0, WFlags f = 0 );
 		virtual ~KexiFrame();
 
 		virtual const TQColor& frameColor() const;
diff --git a/kexi/plugins/forms/widgets/kexipushbutton.cpp b/kexi/plugins/forms/widgets/kexipushbutton.cpp
index 95d0b92ec..dbff6c4b2 100644
--- a/kexi/plugins/forms/widgets/kexipushbutton.cpp
+++ b/kexi/plugins/forms/widgets/kexipushbutton.cpp
@@ -20,8 +20,8 @@
 
 #include "kexipushbutton.h"
 
-KexiPushButton::KexiPushButton( const TQString & text, TQWidget * tqparent, const char * name )
-: KPushButton(text, tqparent, name)
+KexiPushButton::KexiPushButton( const TQString & text, TQWidget * parent, const char * name )
+: KPushButton(text, parent, name)
 {
 }
 
diff --git a/kexi/plugins/forms/widgets/kexipushbutton.h b/kexi/plugins/forms/widgets/kexipushbutton.h
index 3dd8f0a9d..4f9ec5f74 100644
--- a/kexi/plugins/forms/widgets/kexipushbutton.h
+++ b/kexi/plugins/forms/widgets/kexipushbutton.h
@@ -33,7 +33,7 @@ class KEXIFORMUTILS_EXPORT KexiPushButton : public KPushButton
 	TQ_PROPERTY(TQString onClickActionOption READ onClickActionOption WRITE setOnClickActionOption DESIGNABLE true)
 
 	public:
-		KexiPushButton( const TQString & text, TQWidget * tqparent, const char * name = 0 );
+		KexiPushButton( const TQString & text, TQWidget * parent, const char * name = 0 );
 		~KexiPushButton();
 
 	public slots:
diff --git a/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp b/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp
index 7037b29a2..0ca5b7d25 100644
--- a/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp
+++ b/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp
@@ -26,8 +26,8 @@
 
 #include <kgenericfactory.h>
 
-KexiCSVImportExportPart::KexiCSVImportExportPart(TQObject *tqparent, const char *name, const TQStringList &args)
- : KexiInternalPart(tqparent, name, args)
+KexiCSVImportExportPart::KexiCSVImportExportPart(TQObject *parent, const char *name, const TQStringList &args)
+ : KexiInternalPart(parent, name, args)
 {
 }
 
@@ -36,12 +36,12 @@ KexiCSVImportExportPart::~KexiCSVImportExportPart()
 }
 
 TQWidget *KexiCSVImportExportPart::createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
- TQWidget *tqparent, const char *objName, TQMap<TQString,TQString>* args )
+ TQWidget *parent, const char *objName, TQMap<TQString,TQString>* args )
 {
 	if (0==qstrcmp(widgetClass, "KexiCSVImportDialog")) {
 		KexiCSVImportDialog::Mode mode = (args && (*args)["sourceType"]=="file")
 			? KexiCSVImportDialog::File : KexiCSVImportDialog::Clipboard;
-		KexiCSVImportDialog *dlg = new KexiCSVImportDialog( mode, mainWin, tqparent, objName );
+		KexiCSVImportDialog *dlg = new KexiCSVImportDialog( mode, mainWin, parent, objName );
 		m_cancelled = dlg->cancelled();
 		if (m_cancelled) {
 			delete dlg;
@@ -55,7 +55,7 @@ TQWidget *KexiCSVImportExportPart::createWidget(const char* widgetClass, KexiMai
 		KexiCSVExport::Options options;
 		if (!options.assign( *args ))
 			return 0;
-		KexiCSVExportWizard *dlg = new KexiCSVExportWizard( options, mainWin, tqparent, objName);
+		KexiCSVExportWizard *dlg = new KexiCSVExportWizard( options, mainWin, parent, objName);
 		m_cancelled = dlg->cancelled();
 		if (m_cancelled) {
 			delete dlg;
diff --git a/kexi/plugins/importexport/csv/kexicsv_importexportpart.h b/kexi/plugins/importexport/csv/kexicsv_importexportpart.h
index c4a666e31..bd40c2f50 100644
--- a/kexi/plugins/importexport/csv/kexicsv_importexportpart.h
+++ b/kexi/plugins/importexport/csv/kexicsv_importexportpart.h
@@ -27,12 +27,12 @@
 class KexiCSVImportExportPart : public KexiInternalPart
 {
 	public:
-		KexiCSVImportExportPart(TQObject *tqparent, const char *name, const TQStringList &args);
+		KexiCSVImportExportPart(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~KexiCSVImportExportPart();
 
 		/*! Reimplemented to return wizard object. */
 		virtual TQWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
-		 TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
+		 TQWidget *parent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
 
 		/*! Reimplemented to execute a command \a commandName (nonvisual). The result are put into the \a args. */
 		virtual bool executeCommand(KexiMainWindow* mainWin, const char* commandName, 
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 956681b1c..6e9859012 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -44,8 +44,8 @@
 
 
 KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
-	KexiMainWindow* mainWin, TQWidget * tqparent, const char * name )
- : KWizard(tqparent, name)
+	KexiMainWindow* mainWin, TQWidget * parent, const char * name )
+ : KWizard(parent, name)
  , m_options(options)
 // , m_mode(mode)
 // , m_itemId(itemId)
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
index ef2bd17bc..272131597 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
@@ -46,7 +46,7 @@ class KexiCSVExportWizard : public KWizard
 
 	public:
 		KexiCSVExportWizard( const KexiCSVExport::Options& options, KexiMainWindow* mainWin, 
-			TQWidget * tqparent = 0, const char * name = 0 );
+			TQWidget * parent = 0, const char * name = 0 );
 
 		virtual ~KexiCSVExportWizard();
 
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 016012306..18398d39f 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -102,8 +102,8 @@
 class KexiCSVImportDialogTable : public TQTable
 {
 public:
-	KexiCSVImportDialogTable( TQWidget * tqparent = 0, const char * name = 0 )
-	: TQTable(tqparent, name) {
+	KexiCSVImportDialogTable( TQWidget * parent = 0, const char * name = 0 )
+	: TQTable(parent, name) {
 		f = font();
 		f.setBold(true);
 	}
@@ -137,7 +137,7 @@ void installRecursiveEventFilter(TQObject *filter, TQObject *object)
 }
 
 KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, 
-	TQWidget * tqparent, const char * name
+	TQWidget * parent, const char * name
 )
  : KDialogBase( 
 	KDialogBase::Plain, 
@@ -146,7 +146,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	,
 	(mode==File ? User1 : (ButtonCode)0) |Ok|Cancel, 
 	Ok,
-	tqparent, 
+	parent, 
 	name ? name : "KexiCSVImportDialog", 
 	true, 
 	false,
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.h b/kexi/plugins/importexport/csv/kexicsvimportdialog.h
index dd8a51df8..cbb4ac6b7 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.h
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.h
@@ -85,7 +85,7 @@ class KexiCSVImportDialog : public KDialogBase
 		enum Header { TEXT, NUMBER, DATE, CURRENCY };
 
 		//! @todo what about making it kexidb-independent?
-		KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, TQWidget * tqparent, 
+		KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, TQWidget * parent, 
 		  const char * name = 0/*, TQRect const & rect*/);
 
 		virtual ~KexiCSVImportDialog();
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index 23fee674a..ed1a5b304 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -66,13 +66,13 @@ bool KexiCSVImportOptions::operator!= ( const KexiCSVImportOptions & opt ) const
 //----------------------------------
 
 KexiCSVImportOptionsDialog::KexiCSVImportOptionsDialog( 
-	const KexiCSVImportOptions& options, TQWidget* tqparent )
+	const KexiCSVImportOptions& options, TQWidget* parent )
  : KDialogBase( 
 	KDialogBase::Plain, 
 	i18n( "CSV Import Options" ),
 	Ok|Cancel, 
 	Ok,
-	tqparent, 
+	parent, 
 	"KexiCSVImportOptionsDialog", 
 	true, 
 	false
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h
index 51319bbfb..35d8b5cd2 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h
@@ -46,7 +46,7 @@ class KexiCSVImportOptionsDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiCSVImportOptionsDialog( const KexiCSVImportOptions& options, TQWidget* tqparent = 0 );
+		KexiCSVImportOptionsDialog( const KexiCSVImportOptions& options, TQWidget* parent = 0 );
 		virtual ~KexiCSVImportOptionsDialog();
 
 		KexiCSVImportOptions options() const;
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
index f490795b6..48d907b99 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -32,8 +32,8 @@
 
 #define KEXICSV_OTHER_DELIMITER_INDEX 4
 
-KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * tqparent )
- : TQWidget(tqparent, "KexiCSVDelimiterWidget")
+KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * parent )
+ : TQWidget(parent, "KexiCSVDelimiterWidget")
  , m_availableDelimiters(KEXICSV_OTHER_DELIMITER_INDEX)
 
 {
@@ -129,8 +129,8 @@ void KexiCSVDelimiterWidget::setDelimiter(const TQString& delimiter)
 
 //----------------------------------------------------
 
-KexiCSVTextQuoteComboBox::KexiCSVTextQuoteComboBox( TQWidget * tqparent )
- : KComboBox(tqparent, "KexiCSVTextQuoteComboBox")
+KexiCSVTextQuoteComboBox::KexiCSVTextQuoteComboBox( TQWidget * parent )
+ : KComboBox(parent, "KexiCSVTextQuoteComboBox")
 {
 	insertItem( "\"" );
 	insertItem( "'" );
@@ -154,8 +154,8 @@ void KexiCSVTextQuoteComboBox::setTextQuote(const TQString& textQuote)
 
 //----------------------------------------------------
 
-KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* tqparent )
- : TQWidget(tqparent, "KexiCSVInfoLabel")
+KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent )
+ : TQWidget(parent, "KexiCSVInfoLabel")
 {
 	TQVBoxLayout *vbox = new TQVBoxLayout( this, 0, KDialogBase::spacingHint() );
 	TQHBoxLayout *hbox = new TQHBoxLayout( this );
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h
index 7a163ee0d..3c420c7ac 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.h
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h
@@ -50,7 +50,7 @@ class KexiCSVInfoLabel : public TQWidget
 
 		 \pre [icon] [labeltext] [filename] [comment]
 		*/
-		KexiCSVInfoLabel( const TQString& labelText, TQWidget* tqparent );
+		KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent );
 
 		void setFileName( const TQString& fileName );
 		void setLabelText( const TQString& text );
@@ -79,7 +79,7 @@ class KexiCSVDelimiterWidget : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * tqparent = 0 );
+		KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * parent = 0 );
 
 		TQString delimiter() const { return m_delimiter; }
 		void setDelimiter(const TQString& delimiter);
@@ -106,7 +106,7 @@ class KexiCSVDelimiterWidget : public TQWidget
 class KexiCSVTextQuoteComboBox : public KComboBox
 {
 	public:
-		KexiCSVTextQuoteComboBox( TQWidget * tqparent = 0 );
+		KexiCSVTextQuoteComboBox( TQWidget * parent = 0 );
 
 		TQString textQuote() const;
 
diff --git a/kexi/plugins/macros/kexiactions/kexivariable.h b/kexi/plugins/macros/kexiactions/kexivariable.h
index da3f47e24..c6b093cf3 100644
--- a/kexi/plugins/macros/kexiactions/kexivariable.h
+++ b/kexi/plugins/macros/kexiactions/kexivariable.h
@@ -68,7 +68,7 @@ namespace KexiMacro {
 			}
 
 		private:
-			/// The tqparent @a KexiAction implementation.
+			/// The parent @a KexiAction implementation.
 			ACTIONIMPL* m_actionimpl;
 	};
 }
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
index efce73c02..b7e89e9ac 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
@@ -107,8 +107,8 @@ class KexiMacroDesignView::Private
 
 };
 
-KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro)
-	: KexiMacroView(mainwin, tqparent, macro, "KexiMacroDesignView")
+KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro)
+	: KexiMacroView(mainwin, parent, macro, "KexiMacroDesignView")
 	, d( new Private() )
 {
 	// The table's data-model.
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.h b/kexi/plugins/macros/kexipart/keximacrodesignview.h
index e982f1bd3..3529ea0cd 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.h
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.h
@@ -49,10 +49,10 @@ class KexiMacroDesignView : public KexiMacroView
 		*
 		* \param mainwin The \a KexiMainWindow instance this \a KexiViewBase
 		*        belongs to.
-		* \param tqparent The tqparent widget this widget should be displayed in.
+		* \param parent The parent widget this widget should be displayed in.
 		* \param macro The \a KoMacro::Macro instance this view is for.
 		*/
-		KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro);
+		KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro);
 
 		/**
 		* Destructor.
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h
index d902d6a45..e03afbcda 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.h
+++ b/kexi/plugins/macros/kexipart/keximacroerror.h
@@ -57,7 +57,7 @@ class KexiMacroError : public KexiMacroErrorBase
 		/**
 		* Constructor.
 		*
-		* @param mainwin The tqparent @a KexiMainWindow instance.
+		* @param mainwin The parent @a KexiMainWindow instance.
 		* @param context The @a KoMacro::Context where the error happened.
 		*/
 		KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Context> context);
diff --git a/kexi/plugins/macros/kexipart/keximacropart.cpp b/kexi/plugins/macros/kexipart/keximacropart.cpp
index 1fddbd78f..ad9babd3f 100644
--- a/kexi/plugins/macros/kexipart/keximacropart.cpp
+++ b/kexi/plugins/macros/kexipart/keximacropart.cpp
@@ -54,8 +54,8 @@ class KexiMacroPart::Private
 	public:
 };
 
-KexiMacroPart::KexiMacroPart(TQObject *tqparent, const char *name, const TQStringList &l)
-	: KexiPart::Part(tqparent, name, l)
+KexiMacroPart::KexiMacroPart(TQObject *parent, const char *name, const TQStringList &l)
+	: KexiPart::Part(parent, name, l)
 	, d( new Private() )
 {
 	//kdDebug() << "KexiMacroPart::KexiMacroPart() Ctor" << endl;
@@ -123,7 +123,7 @@ void KexiMacroPart::initInstanceActions()
 	//createSharedAction(Kexi::DesignViewMode, i18n("Execute Macro"), "exec", 0, "data_execute");
 }
 
-KexiViewBase* KexiMacroPart::createView(TQWidget* tqparent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*)
+KexiViewBase* KexiMacroPart::createView(TQWidget* parent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*)
 {
 	const TQString itemname = item.name();
 	//kdDebug() << "KexiMacroPart::createView() itemname=" << itemname << endl;
@@ -140,14 +140,14 @@ KexiViewBase* KexiMacroPart::createView(TQWidget* tqparent, KexiDialogBase* dial
 		KexiMainWindow *win = dialog->mainWin();
 		if(win && win->project() && win->project()->dbConnection()) {
 			if(viewMode == Kexi::DesignViewMode) {
-				return new KexiMacroDesignView(win, tqparent, macro);
+				return new KexiMacroDesignView(win, parent, macro);
 			}
 			if(viewMode == Kexi::TextViewMode) {
-				return new KexiMacroTextView(win, tqparent, macro);
+				return new KexiMacroTextView(win, parent, macro);
 			}
 			if(viewMode == Kexi::DataViewMode) {
 				// Called if the macro should be executed.
-				return new KexiMacroView(win, tqparent, macro);
+				return new KexiMacroView(win, parent, macro);
 			}
 		}
 	}
diff --git a/kexi/plugins/macros/kexipart/keximacropart.h b/kexi/plugins/macros/kexipart/keximacropart.h
index 0ea70c068..374679c04 100644
--- a/kexi/plugins/macros/kexipart/keximacropart.h
+++ b/kexi/plugins/macros/kexipart/keximacropart.h
@@ -37,11 +37,11 @@ class KexiMacroPart : public KexiPart::Part
 		/**
 		* Constructor.
 		*
-		* \param tqparent The tqparent TQObject this part is child of.
+		* \param parent The parent TQObject this part is child of.
 		* \param name The name this part has.
 		* \param args Optional list of arguments passed to this part.
 		*/
-		KexiMacroPart(TQObject *tqparent, const char *name, const TQStringList& args);
+		KexiMacroPart(TQObject *parent, const char *name, const TQStringList& args);
 
 		/**
 		* Destructor.
@@ -64,12 +64,12 @@ class KexiMacroPart : public KexiPart::Part
 		/**
 		* Create a new view.
 		*
-		* \param tqparent The tqparent TQWidget the new view is displayed in.
+		* \param parent The parent TQWidget the new view is displayed in.
 		* \param dialog The \a KexiDialogBase the view is child of.
 		* \param item The \a KexiPart::Item this view is for.
 		* \param viewMode The viewmode we like to have a view for.
 		*/
-		virtual KexiViewBase* createView(TQWidget *tqparent,
+		virtual KexiViewBase* createView(TQWidget *parent,
 		                                 KexiDialogBase* dialog,
 		                                 KexiPart::Item& item,
 		                                 int viewMode = Kexi::DesignViewMode,
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index aed4a9bdf..e67794be8 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -53,8 +53,8 @@ class KexiMacroProperty::Private
 		TQString name;
 };
 
-KexiMacroProperty::KexiMacroProperty(KoProperty::Property* tqparent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
-	: KoProperty::CustomProperty(tqparent)
+KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
+	: KoProperty::CustomProperty(parent)
 	, d( new Private() )
 {
 	d->macroitem = macroitem;
@@ -164,8 +164,8 @@ KoProperty::Property* KexiMacroProperty::createProperty(KSharedPtr<KoMacro::Macr
  * KexiMacroPropertyFactory
  */
 
-KexiMacroPropertyFactory::KexiMacroPropertyFactory(TQObject* tqparent)
-	: KoProperty::CustomPropertyFactory(tqparent)
+KexiMacroPropertyFactory::KexiMacroPropertyFactory(TQObject* parent)
+	: KoProperty::CustomPropertyFactory(parent)
 {
 }
 
@@ -173,14 +173,14 @@ KexiMacroPropertyFactory::~KexiMacroPropertyFactory()
 {
 }
 
-KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoProperty::Property* tqparent)
+KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoProperty::Property* parent)
 {
-	kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty tqparent="<<tqparent->name()<<endl;
+	kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty parent="<<parent->name()<<endl;
 
-	KoProperty::CustomProperty* customproperty = tqparent->customProperty();
+	KoProperty::CustomProperty* customproperty = parent->customProperty();
 	KexiMacroProperty* parentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty);
 	if(! parentcustomproperty) {
-		kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() tqparent=" << tqparent->name() << " has an invalid customproperty." << endl;
+		kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() parent=" << parent->name() << " has an invalid customproperty." << endl;
 		return 0;
 	}
 
@@ -189,7 +189,7 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro
 	const TQString name = parentcustomproperty->name();
 	Q_ASSERT(! name.isEmpty());
 
-	KexiMacroProperty* macroproperty = new KexiMacroProperty(tqparent, macroitem, name);
+	KexiMacroProperty* macroproperty = new KexiMacroProperty(parent, macroitem, name);
 	if(! macroproperty->variable().data()) {
 		delete macroproperty; macroproperty = 0;
 		return 0;
@@ -232,12 +232,12 @@ class ListBoxItem : public TQListBoxText
 		virtual ~ListBoxItem() {}
 		void setEnabled(bool enabled) { m_enabled = enabled; }
 		virtual int width(const TQListBox* lb) const {
-			Q_ASSERT( dynamic_cast<KComboBox*>( lb->tqparent() ) );
-			return static_cast<KComboBox*>( lb->tqparent() )->lineEdit()->width() + 2;
+			Q_ASSERT( dynamic_cast<KComboBox*>( lb->parent() ) );
+			return static_cast<KComboBox*>( lb->parent() )->lineEdit()->width() + 2;
 		}
 		virtual int height(const TQListBox* lb) const {
-			Q_ASSERT( dynamic_cast<KComboBox*>( lb->tqparent() ) );
-			return m_enabled ? static_cast<KComboBox*>( lb->tqparent() )->height() + 2 : 0;
+			Q_ASSERT( dynamic_cast<KComboBox*>( lb->parent() ) );
+			return m_enabled ? static_cast<KComboBox*>( lb->parent() )->height() + 2 : 0;
 		}
 	private:
 		bool m_enabled;
@@ -281,7 +281,7 @@ class EditListBoxItem : public ListBoxItem
 	protected:
 		virtual void paint(TQPainter* p) {
 			if(! m_widget) return;
-			Q_ASSERT( dynamic_cast<KComboBox*>( listBox()->tqparent() ) );
+			Q_ASSERT( dynamic_cast<KComboBox*>( listBox()->parent() ) );
 			const int w = width(listBox());
 			const int h = height(listBox());
 			m_widget->setFixedSize(w - 2, h - 2);
@@ -342,7 +342,7 @@ class EditListBoxItem : public ListBoxItem
 				variable->text(), // caption
 				TQString(), // description
 				type, // type
-				0 //parentproperty // tqparent
+				0 //parentproperty // parent
 			);
 
 			m_widget = KoProperty::FactoryManager::self()->createWidgetForProperty(m_prop);
@@ -367,8 +367,8 @@ class EditListBoxItem : public ListBoxItem
 class ListBox : public TQListBox
 {
 	public:
-		ListBox(KComboBox* tqparent, KexiMacroProperty* macroproperty)
-			: TQListBox(tqparent)
+		ListBox(KComboBox* parent, KexiMacroProperty* macroproperty)
+			: TQListBox(parent)
 			, m_macroproperty(macroproperty)
 			, m_edititem(0)
 		{
@@ -501,8 +501,8 @@ class KexiMacroPropertyWidget::Private
 		ListBox* listbox;
 };
 
-KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* tqparent)
-	: KoProperty::Widget(property, tqparent)
+KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* parent)
+	: KoProperty::Widget(property, parent)
 	, d( new Private() )
 {
 	kdDebug() << "KexiMacroPropertyWidget::KexiMacroPropertyWidget() Ctor" << endl;
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.h b/kexi/plugins/macros/kexipart/keximacroproperty.h
index b80857d11..9419304e4 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.h
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.h
@@ -47,24 +47,24 @@ class KexiMacroProperty
 	public:
 
 		/** Constructor. */
-		explicit KexiMacroProperty(KoProperty::Property* tqparent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
+		explicit KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
 		/** Destructor. */
 		virtual ~KexiMacroProperty();
 
-		/** @return the tqparent @a KoProperty::Property instance. */
+		/** @return the parent @a KoProperty::Property instance. */
 		KoProperty::Property* parentProperty() const;
 
 		/** This function is called by @ref KoProperty::Property::setValue() 
 		when a custom property is set.
 		You don't have to modify the property value, it is done by Property class.
-		You just have to update child or tqparent properties value (m_property->tqparent()->setValue()).
+		You just have to update child or parent properties value (m_property->parent()->setValue()).
 		Note that, when calling Property::setValue, you <b>need</b> to set
 		useCustomProperty (3rd parameter) to false, or there will be infinite recursion. */
 		virtual void setValue(const TQVariant &value, bool rememberOldValue);
 
 		/** This function is called by @ref KoProperty::Property::value()
 		when a custom property is set and @ref handleValue() is true.
-		You should return property's value, taken from tqparent's value.*/
+		You should return property's value, taken from parent's value.*/
 		virtual TQVariant value() const;
 
 		/** Tells whether CustomProperty should be used to get the property's value.
@@ -111,18 +111,18 @@ class KexiMacroPropertyFactory : public KoProperty::CustomPropertyFactory
 {
 	public:
 		/** Constructor. */
-		explicit KexiMacroPropertyFactory(TQObject* tqparent);
+		explicit KexiMacroPropertyFactory(TQObject* parent);
 		/** Destructor. */
 		virtual ~KexiMacroPropertyFactory();
 
-		/** @return a new instance of custom property for @p tqparent.
+		/** @return a new instance of custom property for @p parent.
 		 Implement this for property types you want to support.
-		 Use tqparent->type() to get type of the property. */
-		virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property* tqparent);
+		 Use parent->type() to get type of the property. */
+		virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property* parent);
 
 		/** @return a new instance of custom property for @p property.
 		 Implement this for property editor types you want to support.
-		 Use tqparent->type() to get type of the property. */
+		 Use parent->type() to get type of the property. */
 		virtual KoProperty::Widget* createCustomWidget(KoProperty::Property* property);
 
 		/** Initializes this factory. The factory may register itself at
@@ -144,7 +144,7 @@ class KexiMacroPropertyWidget : public KoProperty::Widget
 
 	public:
 		/** Constructor. */
-		explicit KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* tqparent = 0);
+		explicit KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* parent = 0);
 		/** Destructor. */
 		virtual ~KexiMacroPropertyWidget();
 
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index 11d9cee53..e35ee5b2f 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -41,8 +41,8 @@ class KexiMacroTextView::Private
 
 };
 
-KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro)
-	: KexiMacroView(mainwin, tqparent, macro, "KexiMacroTextView")
+KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro)
+	: KexiMacroView(mainwin, parent, macro, "KexiMacroTextView")
 	, d( new Private() )
 {
 	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.h b/kexi/plugins/macros/kexipart/keximacrotextview.h
index 5101c30b0..0acfa9eff 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.h
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.h
@@ -40,10 +40,10 @@ class KexiMacroTextView : public KexiMacroView
 		*
 		* \param mainwin The \a KexiMainWindow instance this \a KexiViewBase
 		*        belongs to.
-		* \param tqparent The tqparent widget this widget should be displayed in.
+		* \param parent The parent widget this widget should be displayed in.
 		* \param macro The \a KoMacro::Macro instance this view is for.
 		*/
-		KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro);
+		KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro);
 
 		/**
 		* Destructor.
diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp
index e13483c1b..e9f9cd333 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroview.cpp
@@ -62,8 +62,8 @@ class KexiMacroView::Private
 
 };
 
-KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, TQWidget *tqparent, KoMacro::Macro* const macro, const char* name)
-	: KexiViewBase(mainwin, tqparent, (name ? name : "KexiMacroView"))
+KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, TQWidget *parent, KoMacro::Macro* const macro, const char* name)
+	: KexiViewBase(mainwin, parent, (name ? name : "KexiMacroView"))
 	, d( new Private(macro) )
 {
 	//kdDebug() << "KexiMacroView::KexiMacroView() Ctor" << endl;
@@ -164,7 +164,7 @@ void KexiMacroView::execute(TQObject* sender)
 	KSharedPtr<KoMacro::Context> context = d->macro->execute(sender);
 	if(context->hadException()) {
 		KexiMacroError* error = new KexiMacroError(
-			mainWin(), // The tqparent KexiMainWindow
+			mainWin(), // The parent KexiMainWindow
 			context // The KoMacro::Context where the error occured.
 		);
 		error->exec();
diff --git a/kexi/plugins/macros/kexipart/keximacroview.h b/kexi/plugins/macros/kexipart/keximacroview.h
index 0c44419b2..f98d394dd 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.h
+++ b/kexi/plugins/macros/kexipart/keximacroview.h
@@ -50,10 +50,10 @@ class KexiMacroView : public KexiViewBase
 		*
 		* \param mainwin The \a KexiMainWindow instance this \a KexiViewBase
 		*        belongs to.
-		* \param tqparent The tqparent widget this widget should be displayed in.
+		* \param parent The parent widget this widget should be displayed in.
 		* \param macro The \a KoMacro::Macro instance this view is for.
 		*/
-		KexiMacroView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro, const char* name = 0);
+		KexiMacroView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro, const char* name = 0);
 
 		/**
 		* Destructor.
diff --git a/kexi/plugins/macros/lib/context.h b/kexi/plugins/macros/lib/context.h
index 558ff0aab..2bb1bef36 100644
--- a/kexi/plugins/macros/lib/context.h
+++ b/kexi/plugins/macros/lib/context.h
@@ -121,7 +121,7 @@ namespace KoMacro {
 			/**
 			* This slot extends the slot above with the passed
 			* @a Context @p context which will be used as
-			* tqparent context for this context.
+			* parent context for this context.
 			*/
 			virtual void activate(KSharedPtr<Context> context);
 
diff --git a/kexi/plugins/macros/lib/manager.h b/kexi/plugins/macros/lib/manager.h
index ae32aad91..733ffb75d 100644
--- a/kexi/plugins/macros/lib/manager.h
+++ b/kexi/plugins/macros/lib/manager.h
@@ -64,7 +64,7 @@ namespace KoMacro {
 	*
 	* // Finally free the publishedobject instance we created. We
 	* // need to free it manualy cause PublishedObject doesn't
-	* // got a TQObject tqparent as argument.
+	* // got a TQObject parent as argument.
 	* delete publishedobject;
 	*
 	* // Finally free the manager-instance. It's always needed
diff --git a/kexi/plugins/migration/keximigrationpart.cpp b/kexi/plugins/migration/keximigrationpart.cpp
index 5d4830eff..a3a099e06 100644
--- a/kexi/plugins/migration/keximigrationpart.cpp
+++ b/kexi/plugins/migration/keximigrationpart.cpp
@@ -23,8 +23,8 @@
 
 #include <kgenericfactory.h>
 
-KexiMigrationPart::KexiMigrationPart(TQObject *tqparent, const char *name, const TQStringList &args)
- : KexiInternalPart(tqparent, name, args)
+KexiMigrationPart::KexiMigrationPart(TQObject *parent, const char *name, const TQStringList &args)
+ : KexiInternalPart(parent, name, args)
 {
 }
 
@@ -33,11 +33,11 @@ KexiMigrationPart::~KexiMigrationPart()
 }
 
 TQWidget *KexiMigrationPart::createWidget(const char* /*widgetClass*/, KexiMainWindow* mainWin, 
- TQWidget *tqparent, const char *objName, TQMap<TQString,TQString>* args )
+ TQWidget *parent, const char *objName, TQMap<TQString,TQString>* args )
 {
 	Q_UNUSED( mainWin );
 
-	KexiMigration::ImportWizard *w = new KexiMigration::ImportWizard(tqparent, args);
+	KexiMigration::ImportWizard *w = new KexiMigration::ImportWizard(parent, args);
 	w->setName(objName);
 	return w;
 }
diff --git a/kexi/plugins/migration/keximigrationpart.h b/kexi/plugins/migration/keximigrationpart.h
index b41656a67..12d38fa5c 100644
--- a/kexi/plugins/migration/keximigrationpart.h
+++ b/kexi/plugins/migration/keximigrationpart.h
@@ -26,13 +26,13 @@
 class KexiMigrationPart : public KexiInternalPart
 {
 	public:
-		KexiMigrationPart(TQObject *tqparent, const char *name, const TQStringList &args);
+		KexiMigrationPart(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~KexiMigrationPart();
 
 		/*! Reimplement this if your internal part has to return widgets 
 		 or TQDialog objects. */
 		virtual TQWidget *createWidget(const char* /*widgetClass*/, KexiMainWindow* mainWin, 
-		 TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
+		 TQWidget *parent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
 };
 
 #endif
diff --git a/kexi/plugins/queries/kexiaddparamdialog.cpp b/kexi/plugins/queries/kexiaddparamdialog.cpp
index 4b1141be0..9b7f5db94 100644
--- a/kexi/plugins/queries/kexiaddparamdialog.cpp
+++ b/kexi/plugins/queries/kexiaddparamdialog.cpp
@@ -26,8 +26,8 @@
 #include "kexiaddparamdialog.moc"
 #include "kexiaddparamwidget.h"
 
-KexiAddParamDialog::KexiAddParamDialog(TQWidget *tqparent)
- : KDialogBase(tqparent, "kexiaddparamdialog", true, i18n("Add Parameter"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true)
+KexiAddParamDialog::KexiAddParamDialog(TQWidget *parent)
+ : KDialogBase(parent, "kexiaddparamdialog", true, i18n("Add Parameter"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true)
 {
 	m_wid=new KexiAddParamWidget(makeVBoxMainWidget());
 	for (int i=1;i<=KexiDataProvider::Parameter::maxType;i++)
diff --git a/kexi/plugins/queries/kexiaddparamdialog.h b/kexi/plugins/queries/kexiaddparamdialog.h
index 2aa27bf7f..3c5439415 100644
--- a/kexi/plugins/queries/kexiaddparamdialog.h
+++ b/kexi/plugins/queries/kexiaddparamdialog.h
@@ -30,7 +30,7 @@ class KexiAddParamDialog : public KDialogBase
   TQ_OBJECT
 	
 	public:
-		KexiAddParamDialog(TQWidget *tqparent);
+		KexiAddParamDialog(TQWidget *parent);
 		virtual ~KexiAddParamDialog();
 		TQString parameterName();
 		int parameterType();
diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
index 938d407fc..555a84cff 100644
--- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
+++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
@@ -27,9 +27,9 @@
 #include <tqlineedit.h>
 #include <tqobjectlist.h>
 
-KexiDynamicQueryParameterDialog::KexiDynamicQueryParameterDialog(TQWidget *tqparent,
+KexiDynamicQueryParameterDialog::KexiDynamicQueryParameterDialog(TQWidget *parent,
 	KexiDataProvider::Parameters *values, const KexiDataProvider::ParameterList &list):
-		KDialogBase(tqparent, "paramddialog", true, i18n("Query Parameters"),
+		KDialogBase(parent, "paramddialog", true, i18n("Query Parameters"),
 		KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true )
 {
 	m_values=values;
diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.h b/kexi/plugins/queries/kexidynamicqueryparameterdialog.h
index 60137c1f5..afa9163dc 100644
--- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.h
+++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.h
@@ -31,7 +31,7 @@ class KexiDynamicQueryParameterDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KexiDynamicQueryParameterDialog(TQWidget *tqparent,KexiDataProvider::Parameters *, const KexiDataProvider::ParameterList &);
+	KexiDynamicQueryParameterDialog(TQWidget *parent,KexiDataProvider::Parameters *, const KexiDataProvider::ParameterList &);
 	virtual ~KexiDynamicQueryParameterDialog();
 
 protected:
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index be16b70d9..e215ab909 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -139,8 +139,8 @@ static bool sortingAllowed(const TQString& fieldName, const TQString& tableName)
 //=========================================================
 
 KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor(
-	KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
- : KexiViewBase(mainWin, tqparent, name)
+	KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+ : KexiViewBase(mainWin, parent, name)
  , d( new Private() )
 {
 	d->conn = mainWin->project()->dbConnection();
@@ -916,8 +916,8 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 				if (!criteriaArgument) {//try table.field
 					criteriaArgument = criterias[tableName+"."+fieldName];
 				}
-				if (criteriaArgument) {//criteria expression is just a tqparent of argument
-					criteriaExpr = criteriaArgument->tqparent()->toBinary();
+				if (criteriaArgument) {//criteria expression is just a parent of argument
+					criteriaExpr = criteriaArgument->parent()->toBinary();
 					usedCriterias.insert(criteriaArgument, (char*)1); //save info. about used criteria
 				}
 			}
@@ -1002,7 +1002,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 		if (usedCriterias[it.current()])
 			continue;
 		//unused: append a new row
-		KexiDB::BinaryExpr *criteriaExpr = criteriaArgument->tqparent()->toBinary();
+		KexiDB::BinaryExpr *criteriaExpr = criteriaArgument->parent()->toBinary();
 		if (!criteriaExpr) {
 			kexipluginswarn << "KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(): "
 				"criteriaExpr is not a binary expr" << endl;
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index 587e60a63..c97c140dc 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -62,7 +62,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
   TQ_OBJECT
 
 	public:
-		KexiQueryDesignerGuiEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiQueryDesignerGuiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		virtual ~KexiQueryDesignerGuiEditor();
 
 //		KexiDB::QuerySchema	*schema();
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index e6eb98355..37fab0e61 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -99,8 +99,8 @@ class KexiQueryDesignerSQLView::Private
 
 //===================
 
-KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
- : KexiViewBase(mainWin, tqparent, name)
+KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+ : KexiViewBase(mainWin, parent, name)
  , d( new Private() )
 {
 	d->splitter = new TQSplitter(this);
diff --git a/kexi/plugins/queries/kexiquerydesignersql.h b/kexi/plugins/queries/kexiquerydesignersql.h
index ae07d4571..fe535b0de 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.h
+++ b/kexi/plugins/queries/kexiquerydesignersql.h
@@ -38,7 +38,7 @@ class KexiQueryDesignerSQLView : public KexiViewBase
   TQ_OBJECT
 
 	public:
-		KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		virtual ~KexiQueryDesignerSQLView();
 
 		TQString sqlText() const;
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 0321ff2b5..7cc626207 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -31,8 +31,8 @@
 
 #include "kexiquerydesignersqlhistory.h"
 
-KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *tqparent, const char *name)
- : TQScrollView(tqparent, name)
+KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const char *name)
+ : TQScrollView(parent, name)
 {
 	viewport()->setPaletteBackgroundColor(white);
 
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index 6709a22fd..a6d55285e 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
@@ -65,7 +65,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView
   TQ_OBJECT
 
 	public:
-		KexiQueryDesignerSQLHistory(TQWidget *tqparent, const char *name=0);
+		KexiQueryDesignerSQLHistory(TQWidget *parent, const char *name=0);
 		virtual ~KexiQueryDesignerSQLHistory();
 
 		KPopupMenu* popupMenu() const;
diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp
index c9ce57556..d0c71eae0 100644
--- a/kexi/plugins/queries/kexiquerypart.cpp
+++ b/kexi/plugins/queries/kexiquerypart.cpp
@@ -37,8 +37,8 @@
 
 //------------------------------------------------
 
-KexiQueryPart::KexiQueryPart(TQObject *tqparent, const char *name, const TQStringList &l)
- : KexiPart::Part(tqparent, name, l)
+KexiQueryPart::KexiQueryPart(TQObject *parent, const char *name, const TQStringList &l)
+ : KexiPart::Part(parent, name, l)
 {
 	// REGISTERED ID:
 	m_registeredPartID = (int)KexiPart::QueryObjectType;
@@ -65,18 +65,18 @@ KexiQueryPart::createTempData(KexiDialogBase* dialog)
 }
 
 KexiViewBase*
-KexiQueryPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*)
+KexiQueryPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*)
 {
 	Q_UNUSED( item );
 
 	kdDebug() << "KexiQueryPart::createView()" << endl;
 
 	if (viewMode == Kexi::DataViewMode) {
-		return new KexiQueryView(dialog->mainWin(), tqparent, "dataview");
+		return new KexiQueryView(dialog->mainWin(), parent, "dataview");
 	}
 	else if (viewMode == Kexi::DesignViewMode) {
 		KexiQueryDesignerGuiEditor* view = new KexiQueryDesignerGuiEditor(
-			dialog->mainWin(), tqparent, "guieditor");
+			dialog->mainWin(), parent, "guieditor");
 		//needed for updating tables combo box:
 		KexiProject *prj = dialog->mainWin()->project();
 		connect(prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)),
@@ -91,7 +91,7 @@ KexiQueryPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, KexiPart::
 		return view;
 	}
 	else if (viewMode == Kexi::TextViewMode) {
-		return new KexiQueryDesignerSQLView(dialog->mainWin(), tqparent, "sqldesigner");
+		return new KexiQueryDesignerSQLView(dialog->mainWin(), parent, "sqldesigner");
 	}
 
 	return 0;
@@ -213,8 +213,8 @@ tristate KexiQueryPart::rename(KexiMainWindow *win, KexiPart::Item &item, const
 
 //----------------
 
-KexiQueryPart::TempData::TempData(KexiDialogBase* tqparent, KexiDB::Connection *conn)
- : KexiDialogTempData(TQT_TQOBJECT(tqparent))
+KexiQueryPart::TempData::TempData(KexiDialogBase* parent, KexiDB::Connection *conn)
+ : KexiDialogTempData(TQT_TQOBJECT(parent))
  , KexiDB::Connection::TableSchemaChangeListenerInterface()
  , queryChangedInPreviousView(false)
  , m_query(0)
@@ -253,7 +253,7 @@ void KexiQueryPart::TempData::registerTableSchemaChanges(KexiDB::QuerySchema *q)
 
 tristate KexiQueryPart::TempData::closeListener()
 {
-	KexiDialogBase* dlg = static_cast<KexiDialogBase*>(TQT_TQWIDGET(tqparent()));
+	KexiDialogBase* dlg = static_cast<KexiDialogBase*>(TQT_TQWIDGET(parent()));
 	return dlg->mainWin()->closeDialog(dlg);
 }
 
@@ -270,7 +270,7 @@ void KexiQueryPart::TempData::setQuery(KexiDB::QuerySchema *query)
 		return;
 	if (m_query
 		/* query not owned by dialog */
-		&& (static_cast<KexiDialogBase*>(TQT_TQWIDGET(tqparent()))->schemaData() != static_cast<KexiDB::SchemaData*>( m_query )))
+		&& (static_cast<KexiDialogBase*>(TQT_TQWIDGET(parent()))->schemaData() != static_cast<KexiDB::SchemaData*>( m_query )))
 	{
 		delete m_query;
 	}
diff --git a/kexi/plugins/queries/kexiquerypart.h b/kexi/plugins/queries/kexiquerypart.h
index aee905e61..1fb2063c0 100644
--- a/kexi/plugins/queries/kexiquerypart.h
+++ b/kexi/plugins/queries/kexiquerypart.h
@@ -47,7 +47,7 @@ class KexiQueryPart : public KexiPart::Part
   TQ_OBJECT
 
 	public:
-		KexiQueryPart(TQObject *tqparent, const char *name, const TQStringList &);
+		KexiQueryPart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~KexiQueryPart();
 
 		virtual bool remove(KexiMainWindow *win, KexiPart::Item &item);
@@ -57,7 +57,7 @@ class KexiQueryPart : public KexiPart::Part
 		                 public KexiDB::Connection::TableSchemaChangeListenerInterface
 		{
 			public:
-				TempData(KexiDialogBase* tqparent, KexiDB::Connection *conn);
+				TempData(KexiDialogBase* parent, KexiDB::Connection *conn);
 				virtual ~TempData();
 				virtual tristate closeListener();
 				void clearQuery();
@@ -66,7 +66,7 @@ class KexiQueryPart : public KexiPart::Part
 
 				/*! Assigns query \a query for this data.
 				 Existing query (available using query()) is deleted but only 
-				 if it is not owned by tqparent dialog (i.e. != KexiDialogBase::schemaData()).
+				 if it is not owned by parent dialog (i.e. != KexiDialogBase::schemaData()).
 				 \a query can be 0. 
 				 If \a query is equal to existing query, nothing is performed.
 				*/
@@ -102,7 +102,7 @@ class KexiQueryPart : public KexiPart::Part
 	protected:
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
 //		virtual void initPartActions( KActionCollection *col );
diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp
index 9d7cc542a..c57224ead 100644
--- a/kexi/plugins/queries/kexiqueryview.cpp
+++ b/kexi/plugins/queries/kexiqueryview.cpp
@@ -50,8 +50,8 @@ class KexiQueryView::Private
 
 //---------------------------------------------------------------------------------
 
-KexiQueryView::KexiQueryView(KexiMainWindow *win, TQWidget *tqparent, const char *name)
- : KexiDataTable(win, tqparent, name)
+KexiQueryView::KexiQueryView(KexiMainWindow *win, TQWidget *parent, const char *name)
+ : KexiDataTable(win, parent, name)
  , d( new Private() )
 {
 	tableView()->setInsertingEnabled(false); //default
diff --git a/kexi/plugins/queries/kexiqueryview.h b/kexi/plugins/queries/kexiqueryview.h
index b1f183ad2..e089bfc4b 100644
--- a/kexi/plugins/queries/kexiqueryview.h
+++ b/kexi/plugins/queries/kexiqueryview.h
@@ -35,7 +35,7 @@ class KexiQueryView : public KexiDataTable
   TQ_OBJECT
 
 	public:
-		KexiQueryView(KexiMainWindow *win, TQWidget *tqparent, const char *name=0);
+		KexiQueryView(KexiMainWindow *win, TQWidget *parent, const char *name=0);
 		~KexiQueryView();
 
 	protected:
diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp
index ded97e1cf..6c5fae1da 100644
--- a/kexi/plugins/relations/kexirelationmaindlg.cpp
+++ b/kexi/plugins/relations/kexirelationmaindlg.cpp
@@ -32,8 +32,8 @@
 #include "kexirelationwidget.h"
 #include "kexirelationview.h"
 
-KexiRelationMainDlg::KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
- : KexiViewBase(mainWin, tqparent, name)
+KexiRelationMainDlg::KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+ : KexiViewBase(mainWin, parent, name)
 {
 	kdDebug() << "KexiRelationMainDlg()" << endl;
 //	setIcon(SmallIcon("relation"));
diff --git a/kexi/plugins/relations/kexirelationmaindlg.h b/kexi/plugins/relations/kexirelationmaindlg.h
index 4dbc76983..a2f8ca578 100644
--- a/kexi/plugins/relations/kexirelationmaindlg.h
+++ b/kexi/plugins/relations/kexirelationmaindlg.h
@@ -31,7 +31,7 @@ class KexiRelationMainDlg : public KexiViewBase
   TQ_OBJECT
 
 	public:
-		KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		~KexiRelationMainDlg();
 
 		virtual TQSize tqsizeHint() const;
diff --git a/kexi/plugins/relations/kexirelationpartimpl.cpp b/kexi/plugins/relations/kexirelationpartimpl.cpp
index 9d08527bf..7656f46d9 100644
--- a/kexi/plugins/relations/kexirelationpartimpl.cpp
+++ b/kexi/plugins/relations/kexirelationpartimpl.cpp
@@ -28,8 +28,8 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 
-KexiRelationPartImpl::KexiRelationPartImpl(TQObject *tqparent, const char *name, const TQStringList &args)
- : KexiInternalPart(tqparent, name, args)
+KexiRelationPartImpl::KexiRelationPartImpl(TQObject *parent, const char *name, const TQStringList &args)
+ : KexiInternalPart(parent, name, args)
 {
 	kdDebug() << "KexiRelationPartImpl()" << endl;
 }
@@ -40,9 +40,9 @@ KexiRelationPartImpl::~KexiRelationPartImpl()
 
 /*TQWidget *
 KexiRelationPartImpl::createWidget(const char* , KexiMainWindow* mainWin, 
- TQWidget *tqparent, const char *objName)
+ TQWidget *parent, const char *objName)
 {
-	return new KexiRelationWidget(mainWin, tqparent, objName);
+	return new KexiRelationWidget(mainWin, parent, objName);
 }*/
 
 /*KexiDialogBase *
@@ -62,14 +62,14 @@ KexiRelationPartImpl::createDialog(KexiMainWindow* mainWin, const char *)
 }*/
 
 KexiViewBase *
-KexiRelationPartImpl::createView(KexiMainWindow* mainWin, TQWidget *tqparent, const char *)
+KexiRelationPartImpl::createView(KexiMainWindow* mainWin, TQWidget *parent, const char *)
 {
 //	kdDebug() << "KexiRelationPartImpl::createDialog()" << endl;
 //	KexiDialogBase * dlg = new KexiDialogBase(mainWin, i18n("Relations"));
 //	dlg->setIcon(SmallIcon("relation"));
 //	dlg->setDocID( mainWin->generatePrivateDocID() );
 
-	KexiRelationMainDlg *view = new KexiRelationMainDlg(mainWin, tqparent, "relations");
+	KexiRelationMainDlg *view = new KexiRelationMainDlg(mainWin, parent, "relations");
 //	dlg->addView(view);
 //	dlg->show();
 //	dlg->registerDialog();
diff --git a/kexi/plugins/relations/kexirelationpartimpl.h b/kexi/plugins/relations/kexirelationpartimpl.h
index 58ee5674d..fc16fbe0e 100644
--- a/kexi/plugins/relations/kexirelationpartimpl.h
+++ b/kexi/plugins/relations/kexirelationpartimpl.h
@@ -28,18 +28,18 @@ class KexiRelationPartImpl : public KexiInternalPart
   TQ_OBJECT
 
 	public:
-		KexiRelationPartImpl(TQObject *tqparent, const char *name, const TQStringList &args);
+		KexiRelationPartImpl(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~KexiRelationPartImpl();
 	
 	protected:
 //		virtual TQWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
-//		 TQWidget *tqparent, const char *objName=0);
+//		 TQWidget *parent, const char *objName=0);
 		
-		virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget *tqparent,
+		virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget *parent,
 		 const char *objName=0);
 
-		//virtual KexiDialogBase *createWindow(KexiMainWindow *tqparent);
-		//virtual TQWidget *createWidget(TQWidget *tqparent, KexiMainWindow *win);
+		//virtual KexiDialogBase *createWindow(KexiMainWindow *parent);
+		//virtual TQWidget *createWidget(TQWidget *parent, KexiMainWindow *win);
 };
 
 #endif
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index d863bc9f5..f45b30bf1 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/kexi/plugins/reports/kexireportfactory.cpp
@@ -33,8 +33,8 @@
 #include "reportwidgets.h"
 #include "kexireportfactory.h"
 
-KexiReportFactory::KexiReportFactory(TQObject *tqparent, const char *name, const TQStringList &)
- : KFormDesigner::WidgetFactory(tqparent, name)
+KexiReportFactory::KexiReportFactory(TQObject *parent, const char *name, const TQStringList &)
+ : KFormDesigner::WidgetFactory(parent, name)
 {
 	KFormDesigner::WidgetInfo *wView = new KFormDesigner::WidgetInfo(this);
 	wView->setPixmap("report");
diff --git a/kexi/plugins/reports/kexireportfactory.h b/kexi/plugins/reports/kexireportfactory.h
index 1813fce71..e7c5f13ae 100644
--- a/kexi/plugins/reports/kexireportfactory.h
+++ b/kexi/plugins/reports/kexireportfactory.h
@@ -29,11 +29,11 @@ class KexiReportFactory : public KFormDesigner::WidgetFactory
   TQ_OBJECT
 
 	public:
-		KexiReportFactory(TQObject *tqparent, const char *name, const TQStringList &args);
+		KexiReportFactory(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~KexiReportFactory();
 
 		virtual TQString  name();
-		virtual TQWidget *createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, KFormDesigner::Container *container,
+		virtual TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, KFormDesigner::Container *container,
 			int options = DefaultOptions);
 
 		virtual bool createMenuActions(const TQCString &classname, TQWidget *w, TQPopupMenu *menu,
@@ -42,7 +42,7 @@ class KexiReportFactory : public KFormDesigner::WidgetFactory
 		virtual bool previewWidget(const TQCString &, TQWidget *, KFormDesigner::Container *);
 
 		//virtual void		saveSpecialProperty(const TQString &classname, const TQString &name, const TQVariant &value, TQWidget *w,
-		         //TQDomElement &parentNode, TQDomDocument &tqparent) {}
+		         //TQDomElement &parentNode, TQDomDocument &parent) {}
 		//virtual void            readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item) {}
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
 
diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp
index 4e04beae5..89423b037 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -26,8 +26,8 @@
 
 #include "kexireportform.h"
 
-KexiReportForm::KexiReportForm(TQWidget *tqparent, const char *name/*, KexiDB::Connection *conn*/)
- : TQWidget(tqparent, name)
+KexiReportForm::KexiReportForm(TQWidget *parent, const char *name/*, KexiDB::Connection *conn*/)
+ : TQWidget(parent, name)
 {
 	//m_conn = conn;
 	kexipluginsdbg << "KexiReportForm::KexiReportForm(): " << endl;
diff --git a/kexi/plugins/reports/kexireportform.h b/kexi/plugins/reports/kexireportform.h
index 9f13fbc91..8813a2c37 100644
--- a/kexi/plugins/reports/kexireportform.h
+++ b/kexi/plugins/reports/kexireportform.h
@@ -33,7 +33,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportForm : public TQWidget, public KFormDesig
   TQ_OBJECT
 
 	public:
-		KexiReportForm(TQWidget *tqparent, const char *name="kexi_dbform");
+		KexiReportForm(TQWidget *parent, const char *name="kexi_dbform");
 		virtual ~KexiReportForm();
 
 		/*TQString datasource() const { return m_ds; }
diff --git a/kexi/plugins/reports/kexireportpart.cpp b/kexi/plugins/reports/kexireportpart.cpp
index 6b9c6bc32..08c4cf7c5 100644
--- a/kexi/plugins/reports/kexireportpart.cpp
+++ b/kexi/plugins/reports/kexireportpart.cpp
@@ -43,8 +43,8 @@
 
 KFormDesigner::WidgetLibrary* KexiReportPart::static_reportsLibrary = 0L;
 
-KexiReportPart::KexiReportPart(TQObject *tqparent, const char *name, const TQStringList &l)
- : KexiPart::Part(tqparent, name, l)
+KexiReportPart::KexiReportPart(TQObject *parent, const char *name, const TQStringList &l)
+ : KexiPart::Part(parent, name, l)
 {
 	// REGISTERED ID:
 	m_registeredPartID = (int)KexiPart::ReportObjectType;
@@ -101,7 +101,7 @@ KexiReportPart::createTempData(KexiDialogBase* dialog)
 }
 
 KexiViewBase*
-KexiReportPart::createView(TQWidget *tqparent, KexiDialogBase* dialog,
+KexiReportPart::createView(TQWidget *parent, KexiDialogBase* dialog,
 	KexiPart::Item &item, int, TQMap<TQString,TQString>*)
 {
 	kexipluginsdbg << "KexiReportPart::createView()" << endl;
@@ -109,7 +109,7 @@ KexiReportPart::createView(TQWidget *tqparent, KexiDialogBase* dialog,
 	if (!win || !win->project() || !win->project()->dbConnection())
 		return 0;
 
-	KexiReportView *view = new KexiReportView(win, tqparent, item.name().latin1(),
+	KexiReportView *view = new KexiReportView(win, parent, item.name().latin1(),
 		win->project()->dbConnection() );
 
 	return view;
@@ -128,8 +128,8 @@ KexiReportPart::i18nMessage(const TQCString& englishMessage, KexiDialogBase* dlg
 
 //---------------
 
-KexiReportPart::TempData::TempData(TQObject* tqparent)
- : KexiDialogTempData(tqparent)
+KexiReportPart::TempData::TempData(TQObject* parent)
+ : KexiDialogTempData(parent)
 {
 }
 
diff --git a/kexi/plugins/reports/kexireportpart.h b/kexi/plugins/reports/kexireportpart.h
index ee93580fc..47f9d4ef2 100644
--- a/kexi/plugins/reports/kexireportpart.h
+++ b/kexi/plugins/reports/kexireportpart.h
@@ -45,7 +45,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportPart : public KexiPart::Part
   TQ_OBJECT
 
 	public:
-		KexiReportPart(TQObject *tqparent, const char *name, const TQStringList &);
+		KexiReportPart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~KexiReportPart();
 
 		//! \return a pointer to Reports Widget Library.
@@ -58,7 +58,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportPart : public KexiPart::Part
 		class TempData : public KexiDialogTempData
 		{
 			public:
-				TempData(TQObject* tqparent);
+				TempData(TQObject* parent);
 				~TempData();
 				TQGuardedPtr<KFormDesigner::Form> form;
 				TQGuardedPtr<KFormDesigner::Form> previewForm;
@@ -73,7 +73,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportPart : public KexiPart::Part
 	protected:
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog,
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog,
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
 		virtual void initPartActions();
diff --git a/kexi/plugins/reports/kexireportview.cpp b/kexi/plugins/reports/kexireportview.cpp
index 403c02777..2de5f4a7f 100644
--- a/kexi/plugins/reports/kexireportview.cpp
+++ b/kexi/plugins/reports/kexireportview.cpp
@@ -39,8 +39,8 @@
 
 #define NO_DSWIZARD
 
-KexiReportScrollView::KexiReportScrollView(TQWidget *tqparent, bool preview)
- : KexiScrollView(tqparent, preview)
+KexiReportScrollView::KexiReportScrollView(TQWidget *parent, bool preview)
+ : KexiScrollView(parent, preview)
 {
 	if(preview) {
 		setRecordNavigatorVisible(true);
@@ -61,7 +61,7 @@ KexiReportScrollView::show()
 
 	//now get resize mode settings for entire form
 	if (m_preview) {
-		KexiReportView* fv = dynamic_cast<KexiReportView*>(tqparent());
+		KexiReportView* fv = dynamic_cast<KexiReportView*>(parent());
 		int resizeMode = fv ? fv->resizeMode() : KexiReportView::ResizeAuto;
 		if (resizeMode == KexiReportView::ResizeAuto)
 			setResizePolicy(AutoOneFit);
@@ -80,9 +80,9 @@ KexiReportScrollView::slotResizingStarted()
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
-KexiReportView::KexiReportView(KexiMainWindow *win, TQWidget *tqparent, const char *name,
+KexiReportView::KexiReportView(KexiMainWindow *win, TQWidget *parent, const char *name,
 	KexiDB::Connection *conn)
- : KexiViewBase(win, tqparent, name), m_propertySet(0), m_conn(conn)
+ : KexiViewBase(win, parent, name), m_propertySet(0), m_conn(conn)
  , m_resizeMode(KexiReportView::ResizeDefault)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this);
diff --git a/kexi/plugins/reports/kexireportview.h b/kexi/plugins/reports/kexireportview.h
index 2b88c1819..df4b31909 100644
--- a/kexi/plugins/reports/kexireportview.h
+++ b/kexi/plugins/reports/kexireportview.h
@@ -37,7 +37,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportScrollView : public KexiScrollView
   TQ_OBJECT
 
 	public:
-		KexiReportScrollView(TQWidget *tqparent, bool preview);
+		KexiReportScrollView(TQWidget *parent, bool preview);
 		virtual ~KexiReportScrollView();
 
 		void setForm(KFormDesigner::Form *form) { m_form = form; }
@@ -73,7 +73,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportView : public KexiViewBase
 			NoResize = 2 /*! @todo */
 		};
 
-		KexiReportView(KexiMainWindow *win, TQWidget *tqparent, const char *name, KexiDB::Connection *conn);
+		KexiReportView(KexiMainWindow *win, TQWidget *parent, const char *name, KexiDB::Connection *conn);
 		virtual ~KexiReportView();
 
 		KexiDB::Connection* connection() { return m_conn; }
diff --git a/kexi/plugins/reports/reportwidgets.cpp b/kexi/plugins/reports/reportwidgets.cpp
index c3ca65e44..7cea50a35 100644
--- a/kexi/plugins/reports/reportwidgets.cpp
+++ b/kexi/plugins/reports/reportwidgets.cpp
@@ -28,16 +28,16 @@
 #include "kexireportview.h"
 #include "reportwidgets.h"
 
-Label::Label(const TQString &text, TQWidget *tqparent, const char *name)
-: TQLabel(text, tqparent, name)
+Label::Label(const TQString &text, TQWidget *parent, const char *name)
+: TQLabel(text, parent, name)
 {
 	setPaletteBackgroundColor(white);
 }
 
 ////////////////////////////////////////////////////////////////////
 
-ReportLine::ReportLine(TQWidget *tqparent, const char *name)
-: TQWidget(tqparent, name)
+ReportLine::ReportLine(TQWidget *parent, const char *name)
+: TQWidget(parent, name)
 {
 	m_lineStyle = (ReportLineStyle)TQt::SolidLine;
 	m_lineWidth = 1;
@@ -113,8 +113,8 @@ ReportLine::paintEvent (TQPaintEvent *ev)
 ////////////////////////////////////////////////////////////////////
 
 
-PicLabel::PicLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name)
- : TQLabel(tqparent, name)
+PicLabel::PicLabel(const TQPixmap &pix, TQWidget *parent, const char *name)
+ : TQLabel(parent, name)
 {
 	setPixmap(pix);
 	setScaledContents(false);
@@ -131,8 +131,8 @@ PicLabel::setProperty(const char *name, const TQVariant &value)
 
 ////////////////////////////////////////////////////////////////////
 
-KexiSubReport::KexiSubReport(TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_form(0), m_widget(0)
+KexiSubReport::KexiSubReport(TQWidget *parent, const char *name)
+: TQScrollView(parent, name), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::Plain | TQFrame::Box);
 	viewport()->setPaletteBackgroundColor(white);
diff --git a/kexi/plugins/reports/reportwidgets.h b/kexi/plugins/reports/reportwidgets.h
index 9e5875560..1452f41e6 100644
--- a/kexi/plugins/reports/reportwidgets.h
+++ b/kexi/plugins/reports/reportwidgets.h
@@ -38,7 +38,7 @@ class KexiSubReport : public TQScrollView
 	TQ_PROPERTY(TQString reportName READ reportName WRITE setReportName DESIGNABLE true);
 
 	public:
-		KexiSubReport(TQWidget *tqparent, const char *name);
+		KexiSubReport(TQWidget *parent, const char *name);
 		~KexiSubReport() {}
 
 		//! \return the name of the subreport inside the db
@@ -59,7 +59,7 @@ class Label : public TQLabel
   TQ_OBJECT
 
 	public:
-		Label(const TQString &text, TQWidget *tqparent, const char *name);
+		Label(const TQString &text, TQWidget *parent, const char *name);
 		~Label() {}
 };
 
@@ -70,7 +70,7 @@ class PicLabel : public TQLabel
   TQ_OBJECT
 
 	public:
-		PicLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name);
+		PicLabel(const TQPixmap &pix, TQWidget *parent, const char *name);
 		~PicLabel() {}
 
 		virtual bool setProperty(const char *name, const TQVariant &value);
@@ -91,7 +91,7 @@ class ReportLine : public TQWidget
 			DashDot = TQt::DashDotLine, DashDotDot =  TQt::DashDotDotLine };
 		enum CapStyle { Flat = TQt::FlatCap, Square = TQt::SquareCap, Round = TQt::RoundCap };
 
-		ReportLine(TQWidget *tqparent, const char *name);
+		ReportLine(TQWidget *parent, const char *name);
 		~ReportLine(){;}
 
 		ReportLineStyle lineStyle() const;
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index 50a875b38..421bc31fb 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -64,8 +64,8 @@ class KexiScriptDesignViewPrivate
         KTextBrowser* statusbrowser;
 };
 
-KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *tqparent, Kross::Api::ScriptAction* scriptaction)
-    : KexiViewBase(mainWin, tqparent, "KexiScriptDesignView")
+KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *parent, Kross::Api::ScriptAction* scriptaction)
+    : KexiViewBase(mainWin, parent, "KexiScriptDesignView")
     , d( new KexiScriptDesignViewPrivate() )
 {
     d->scriptaction = scriptaction;
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h
index ac5240ed2..b3dec3602 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h
@@ -53,7 +53,7 @@ class KexiScriptDesignView : public KexiViewBase
         /**
          * Constructor.
          */
-        KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *tqparent, Kross::Api::ScriptAction* scriptaction);
+        KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *parent, Kross::Api::ScriptAction* scriptaction);
 
         /**
          * Destructor.
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
index a6f2dfc15..8aec288b9 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
@@ -41,8 +41,8 @@ class KexiScriptEditor::Private
         Private() : scriptaction(0) {}
 };
 
-KexiScriptEditor::KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
-    : KexiEditor(mainWin, tqparent, name)
+KexiScriptEditor::KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+    : KexiEditor(mainWin, parent, name)
     , d( new Private() )
 {
 }
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h
index 22415a7b1..a00e3aa29 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h
@@ -43,7 +43,7 @@ class KexiScriptEditor : public KexiEditor
         /**
          * Constructor.
          */
-        KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+        KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 
         /**
          * Destructor.
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index b778bc75c..cb66734d6 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -44,8 +44,8 @@ class KexiScriptPart::Private
 		Kross::Api::ScriptGUIClient* scriptguiclient;
 };
 
-KexiScriptPart::KexiScriptPart(TQObject *tqparent, const char *name, const TQStringList &l)
-	: KexiPart::Part(tqparent, name, l)
+KexiScriptPart::KexiScriptPart(TQObject *parent, const char *name, const TQStringList &l)
+	: KexiPart::Part(parent, name, l)
 	, d( new Private() )
 {
 	d->scriptguiclient = 0;
@@ -159,7 +159,7 @@ void KexiScriptPart::initInstanceActions()
 	createSharedAction(Kexi::DesignViewMode, i18n("Configure Editor..."), "configure", 0, "script_config_editor");
 }
 
-KexiViewBase* KexiScriptPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*)
+KexiViewBase* KexiScriptPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*)
 {
 	TQString partname = item.name();
 	if( ! partname.isNull() ) {
@@ -181,7 +181,7 @@ KexiViewBase* KexiScriptPart::createView(TQWidget *tqparent, KexiDialogBase* dia
 		}
 
 		if(viewMode == Kexi::DesignViewMode) {
-			return new KexiScriptDesignView(win, tqparent, scriptaction);
+			return new KexiScriptDesignView(win, parent, scriptaction);
 		}
 	}
 	return 0;
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h
index eca7a0015..b2928a8fa 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h
@@ -42,11 +42,11 @@ class KexiScriptPart : public KexiPart::Part
         /**
          * Constructor.
          *
-         * \param tqparent The tqparent TQObject this part is child of.
+         * \param parent The parent TQObject this part is child of.
          * \param name The name this part has.
          * \param args Optional list of arguments passed to this part.
          */
-        KexiScriptPart(TQObject *tqparent, const char *name, const TQStringList& args);
+        KexiScriptPart(TQObject *parent, const char *name, const TQStringList& args);
 
         /**
          * Destructor.
@@ -69,12 +69,12 @@ class KexiScriptPart : public KexiPart::Part
         /**
          * Create a new view.
          *
-         * \param tqparent The tqparent TQWidget the new view is displayed in.
+         * \param parent The parent TQWidget the new view is displayed in.
          * \param dialog The \a KexiDialogBase the view is child of.
          * \param item The \a KexiPart::Item this view is for.
          * \param viewMode The viewmode we like to have a view for.
          */
-        virtual KexiViewBase* createView(TQWidget *tqparent,
+        virtual KexiViewBase* createView(TQWidget *parent,
                                          KexiDialogBase* dialog,
                                          KexiPart::Item& item,
                                          int viewMode = Kexi::DesignViewMode,
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
index bdec927b1..6f75bdeab 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
@@ -89,9 +89,9 @@ def runGuiApp(copycenter, name):
 	#--------------------------------------------------------------------
 
 	class ListViewDialog(qt.QDialog):
-		def __init__(self, tqparent, caption):
-			qt.QDialog.__init__(self, tqparent, "ProgressDialog", 1)
-			self.tqparent = tqparent
+		def __init__(self, parent, caption):
+			qt.QDialog.__init__(self, parent, "ProgressDialog", 1)
+			self.parent = parent
 			self.setCaption(caption)
 			tqlayout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
@@ -124,9 +124,9 @@ def runGuiApp(copycenter, name):
 	#--------------------------------------------------------------------
 
 	class CopyJobWidget(qt.QVBox):
-		def __init__(self,dialog,tqparent):
+		def __init__(self,dialog,parent):
 			self.dialog = dialog
-			qt.QVBox.__init__(self,tqparent)
+			qt.QVBox.__init__(self,parent)
 			self.setSpacing(6)
 			typebox = qt.QHBox(self)
 			typebox.setSpacing(6)
@@ -165,7 +165,7 @@ def runGuiApp(copycenter, name):
 		def doubleClicked(self, **args):
 			print "CopyJobWidget.doubleClicked"
 			item = self.listview.selectedItem()
-			if item and item.tqparent(): item.startRename(1)
+			if item and item.parent(): item.startRename(1)
 
 		def readOptions(self,domnode,plugininst):
 			print "CopyJobWidget.readOptions plugintype=\"%s\"" % plugininst.plugintype
@@ -442,13 +442,13 @@ def runGuiApp(copycenter, name):
 	#--------------------------------------------------------------------
 
 	class DataSelector(qt.QVGroupBox):
-		def __init__(self, plugintype, title, caption, tqparent, dialog, items):
+		def __init__(self, plugintype, title, caption, parent, dialog, items):
 			self.plugintype = plugintype
 			self.pluginimpl = None
 			self.dialog = dialog
 			self.mainbox = None
 
-			qt.QVGroupBox.__init__(self,title,tqparent)
+			qt.QVGroupBox.__init__(self,title,parent)
 			self.setInsideMargin(6)
 			self.setInsideSpacing(0)
 
@@ -520,7 +520,7 @@ def runGuiApp(copycenter, name):
 	#--------------------------------------------------------------------
 
 	class Dialog(qt.QDialog):
-		def __init__(self, copycenter, tqparent):
+		def __init__(self, copycenter, parent):
 			self.copycenter = copycenter
 
 			import qt
@@ -528,7 +528,7 @@ def runGuiApp(copycenter, name):
 			import sys
 
 			self.ListViewDialog = ListViewDialog
-			qt.QDialog.__init__(self, tqparent, "Dialog", 1, qt.Qt.WDestructiveClose)
+			qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose)
 			self.setCaption("Copy Center")
 			tqlayout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py
index 85023ee42..e82414050 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py
@@ -53,9 +53,9 @@ class CopyCenterPlugin:
 		def finish(self):
 			""" Called if reading is finished."""
 			self.connection.finish()
-		def createWidget(self, dialog, tqparent):
+		def createWidget(self, dialog, parent):
 			""" Create and return a widget to modify the plugin settings. """
-			return self.copycenterplugin.createWidget(dialog, self, tqparent)
+			return self.copycenterplugin.createWidget(dialog, self, parent)
 
 	class Source(Plugin):
 		""" Specialization of the Plugin class to implement the
@@ -196,7 +196,7 @@ class CopyCenterPlugin:
 		self.drivermanager = krosskexidb.DriverManager()
 		self.copycenter = copycenter
 
-	def createWidget(self, dialog, plugin, tqparent):
+	def createWidget(self, dialog, plugin, parent):
 		""" Each plugin may provide a qt.QWidget back to the
 		CopyCenter.py. The widget will be used to configure our
 		plugin settings. """
@@ -208,12 +208,12 @@ class CopyCenterPlugin:
 		self.dialog = dialog
 		self.mainbox = None
 		class ProjectBox(qt.QHBox):
-			def __init__(self,main,copycenterplugin,plugin,tqparent):
+			def __init__(self,main,copycenterplugin,plugin,parent):
 				self.main = main
 				self.copycenterplugin = copycenterplugin
 				self.plugin = plugin
 
-				qt.QHBox.__init__(self,tqparent)
+				qt.QHBox.__init__(self,parent)
 				prjlabel = qt.QLabel("Project File:",self)
 				self.prjcombo = qt.QComboBox(self)
 				self.prjcombo.setEditable(True)
@@ -244,8 +244,8 @@ class CopyCenterPlugin:
 				if str(filename) != "": self.prjcombo.setCurrentText(str(filename))
 
 		class DriverBox(qt.QVBox):
-			def __init__(self,main,tqparent):
-				qt.QVBox.__init__(self,tqparent)
+			def __init__(self,main,parent):
+				qt.QVBox.__init__(self,parent)
 				self.main = main
 				self.copycenterplugin = main.copycenterplugin
 				self.plugin = main.plugin
@@ -364,8 +364,8 @@ class CopyCenterPlugin:
 				if str(filename) != "": self.sockfileedit.setText(str(filename))
 
 		class TableBox(qt.QHBox):
-			def __init__(self,copycenterplugin,plugin,tqparent):
-				qt.QHBox.__init__(self,tqparent)
+			def __init__(self,copycenterplugin,plugin,parent):
+				qt.QHBox.__init__(self,parent)
 				self.copycenterplugin = copycenterplugin
 				self.plugin = plugin
 				tablelabel = qt.QLabel("Table:",self)
@@ -405,8 +405,8 @@ class CopyCenterPlugin:
 				dialog.show()
 
 		class FieldBox(qt.QHBox):
-			def __init__(self,copycenterplugin,plugin,tqparent):
-				qt.QHBox.__init__(self,tqparent)
+			def __init__(self,copycenterplugin,plugin,parent):
+				qt.QHBox.__init__(self,parent)
 				self.copycenterplugin = copycenterplugin
 				self.plugin = plugin
 				self.tablename = ""
@@ -462,15 +462,15 @@ class CopyCenterPlugin:
 				self.fieldsbtn.setEnabled(False)
 
 		class MainBox(qt.QHBox):
-			def __init__(self,copycenterplugin,plugin,tqparent):
-				qt.QHBox.__init__(self,tqparent)
+			def __init__(self,copycenterplugin,plugin,parent):
+				qt.QHBox.__init__(self,parent)
 				self.copycenterplugin = copycenterplugin
 				self.plugin = plugin
 
-				self.prjbox = ProjectBox(self,copycenterplugin,plugin,tqparent)
-				self.driverbox = DriverBox(self,tqparent)
+				self.prjbox = ProjectBox(self,copycenterplugin,plugin,parent)
+				self.driverbox = DriverBox(self,parent)
 
-				statusbar = qt.QHBox(tqparent)
+				statusbar = qt.QHBox(parent)
 				statusbar.setSpacing(2)
 				#self.statuslabel = qt.QLabel("Disconnected",statusbar)
 				#statusbar.setStretchFactor(self.statuslabel,1)
@@ -482,9 +482,9 @@ class CopyCenterPlugin:
 				self.disconnectbtn.setEnabled(False)
 				qt.QObject.connect(self.disconnectbtn, qt.SIGNAL("clicked()"),self.disconnectClicked)
 
-				#self.connectionbox = ConnectionBox(copycenterplugin,plugin,tqparent)
-				self.tablebox = TableBox(copycenterplugin,plugin,tqparent)
-				self.fieldbox = FieldBox(copycenterplugin,plugin,tqparent)
+				#self.connectionbox = ConnectionBox(copycenterplugin,plugin,parent)
+				self.tablebox = TableBox(copycenterplugin,plugin,parent)
+				self.fieldbox = FieldBox(copycenterplugin,plugin,parent)
 				qt.QObject.connect(self.tablebox.tableedit, qt.SIGNAL("textChanged(const QString&)"), self.fieldbox.tableChanged)
 
 				if self.plugin.options['project'] != '':
@@ -499,7 +499,7 @@ class CopyCenterPlugin:
 						pass
 
 				if self.plugin.plugintype == "Destination":
-					#typebox = qt.QHBox(tqparent)
+					#typebox = qt.QHBox(parent)
 					#label = qt.QLabel("Operation:",typebox)
 					#combobox = qt.QComboBox(typebox)
 					#combobox.insertItem("Append")
@@ -511,15 +511,15 @@ class CopyCenterPlugin:
 					#typebox.setStretchFactor(combobox,1)
 					pass
 				elif self.plugin.plugintype == "Source":
-					wherebox = qt.QHBox(tqparent)
+					wherebox = qt.QHBox(parent)
 					wherelabel = qt.QLabel("Where:",wherebox)
 					self.whereedit = qt.QLineEdit(self.plugin.options['where'],wherebox)
 
-					#orderbox = qt.QHBox(tqparent)
+					#orderbox = qt.QHBox(parent)
 					#orderlabel = qt.QLabel("Order By:",orderbox)
 					#orderedit = qt.QLineEdit("",orderbox)
 
-				#errbox = qt.QHBox(tqparent)
+				#errbox = qt.QHBox(parent)
 				#errlabel = qt.QLabel("On Error:",errbox)
 				#errcombo = qt.QComboBox(errbox)
 				#errcombo.insertItem("Ask")
@@ -640,7 +640,7 @@ class CopyCenterPlugin:
 					pass
 				return ""
 				
-		mainbox = MainBox(self,plugin,tqparent)
+		mainbox = MainBox(self,plugin,parent)
 		plugin.widget = mainbox
 		return mainbox
 
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
index de553b920..678cf40ba 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
@@ -39,8 +39,8 @@ class CopyCenterPlugin:
 		def finish(self):
 			self.isfinished = True
 			self.widget.disconnectClicked()
-		def createWidget(self,dialog,tqparent):
-			return self.copycenterplugin.widget(dialog, self, tqparent)
+		def createWidget(self,dialog,parent):
+			return self.copycenterplugin.widget(dialog, self, parent)
 
 	class Source(Plugin):
 		plugintype = "Source"
@@ -209,7 +209,7 @@ class CopyCenterPlugin:
 		""" Constructor. """
 		pass
 
-	def widget(self,dialog,plugin,tqparent):
+	def widget(self,dialog,plugin,parent):
 		""" Each plugin may provide a qt.QWidget back to the
 		CopyCenter.py. The widget will be used to configure our
 		plugin settings. """
@@ -246,7 +246,7 @@ class CopyCenterPlugin:
 
 		class FieldsDialog(ListViewDialog):
 			def __init__(self, mainwidget):
-				ListViewDialog.__init__(self,tqparent,"Fields")
+				ListViewDialog.__init__(self,parent,"Fields")
 				self.mainwidget = mainwidget
 				self.listview.setSelectionMode(qt.QListView.Multi)
 				self.listview.setSorting(-1)
@@ -280,14 +280,14 @@ class CopyCenterPlugin:
 
 
 		class MainWidget(qt.QHBox):
-			def __init__(self,plugin,dialog,tqparent):
+			def __init__(self,plugin,dialog,parent):
 				import qt
 				import qtsql
-				qt.QHBox.__init__(self,tqparent)
+				qt.QHBox.__init__(self,parent)
 				self.dialog = dialog
 				self.plugin = plugin
 
-				self.connectionbox = qt.QVBox(tqparent)
+				self.connectionbox = qt.QVBox(parent)
 				self.connectionbox.setSpacing(2)
 
 				driverbox = qt.QHBox(self.connectionbox)
@@ -331,7 +331,7 @@ class CopyCenterPlugin:
 				dblabel.setBuddy(self.dbedit)
 				dbbox.setStretchFactor(self.dbedit,1)
 				
-				statusbar = qt.QHBox(tqparent)
+				statusbar = qt.QHBox(parent)
 				statusbar.setSpacing(2)
 				statusbar.setStretchFactor(qt.QWidget(statusbar),1)
 				self.connectbtn = qt.QPushButton("Connect",statusbar)
@@ -340,7 +340,7 @@ class CopyCenterPlugin:
 				self.disconnectbtn.setEnabled(False)
 				qt.QObject.connect(self.disconnectbtn, qt.SIGNAL("clicked()"),self.disconnectClicked)
 
-				tablebox = qt.QHBox(tqparent)
+				tablebox = qt.QHBox(parent)
 				tablelabel = qt.QLabel("Table:",tablebox)
 				self.tableedit = qt.QLineEdit(self.plugin.options['table'],tablebox)
 				qt.QObject.connect(self.tableedit, qt.SIGNAL("textChanged(const QString&)"), self.tableEditChanged)
@@ -350,7 +350,7 @@ class CopyCenterPlugin:
 				tablelabel.setBuddy(self.tableedit)
 				tablebox.setStretchFactor(self.tableedit,1)
 
-				fieldbox = qt.QHBox(tqparent)
+				fieldbox = qt.QHBox(parent)
 				fieldlabel = qt.QLabel("Fields:",fieldbox)
 				self.fieldedit = qt.QLineEdit(self.plugin.options['fields'],fieldbox)
 				self.fieldbtn = qt.QPushButton("...",fieldbox)
@@ -360,7 +360,7 @@ class CopyCenterPlugin:
 				fieldbox.setStretchFactor(self.fieldedit,1)
 
 				if self.plugin.plugintype == "Source":
-					box = qt.QHBox(tqparent)
+					box = qt.QHBox(parent)
 					wherelabel = qt.QLabel("Where:",box)
 					self.whereedit = qt.QLineEdit(self.plugin.options['where'],box)
 					wherelabel.setBuddy(self.whereedit)
@@ -368,9 +368,9 @@ class CopyCenterPlugin:
 				elif self.plugin.plugintype == "Destination":
 					
 					class OperationBox(qt.QVBox):
-						def __init__(self, mainwidget, tqparent):
+						def __init__(self, mainwidget, parent):
 							self.mainwidget = mainwidget
-							qt.QVBox.__init__(self, tqparent)
+							qt.QVBox.__init__(self, parent)
 							opbox = qt.QHBox(self)
 							operationlabel = qt.QLabel("Operation:",opbox)
 							self.mainwidget.operationedit = qt.QComboBox(opbox)
@@ -401,7 +401,7 @@ class CopyCenterPlugin:
 								1: showUpdate,
 							}[ self.mainwidget.operationedit.currentItem() ](self)
 							if self.box != None: self.box.show()
-					OperationBox(self,tqparent)
+					OperationBox(self,parent)
 
 			def tableEditChanged(self,text):
 				if self.plugin.database != None and self.plugin.database.isOpen():
@@ -491,5 +491,5 @@ class CopyCenterPlugin:
 				print "database is closed now!"
 				self.updateConnectState()
 
-		plugin.widget = MainWidget(plugin,self.dialog,tqparent)
+		plugin.widget = MainWidget(plugin,self.dialog,parent)
 		return plugin.widget
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index 33e12d646..443f26d4d 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -122,8 +122,8 @@ class KexiLookupColumnPage::Private
 
 //----------------------------------------------
 
-KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *tqparent)
- : TQWidget(tqparent)
+KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
+ : TQWidget(parent)
  , d(new Private())
 {
 	setName("KexiLookupColumnPage");
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.h b/kexi/plugins/tables/kexilookupcolumnpage.h
index f7b79bb2e..d5c6d1749 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.h
+++ b/kexi/plugins/tables/kexilookupcolumnpage.h
@@ -48,7 +48,7 @@ class KexiLookupColumnPage : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiLookupColumnPage(TQWidget *tqparent);
+		KexiLookupColumnPage(TQWidget *parent);
 		virtual ~KexiLookupColumnPage();
 
 	public slots:
diff --git a/kexi/plugins/tables/kexitabledesigner_dataview.cpp b/kexi/plugins/tables/kexitabledesigner_dataview.cpp
index e1b8ddb96..36283c1f4 100644
--- a/kexi/plugins/tables/kexitabledesigner_dataview.cpp
+++ b/kexi/plugins/tables/kexitabledesigner_dataview.cpp
@@ -26,8 +26,8 @@
 #include "kexidatatableview.h"
 #include "keximainwindow.h"
 
-KexiTableDesigner_DataView::KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *tqparent)
- : KexiDataTable(win, tqparent, "KexiTableDesigner_DataView", true/*db-aware*/)
+KexiTableDesigner_DataView::KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *parent)
+ : KexiDataTable(win, parent, "KexiTableDesigner_DataView", true/*db-aware*/)
 {
 }
 
diff --git a/kexi/plugins/tables/kexitabledesigner_dataview.h b/kexi/plugins/tables/kexitabledesigner_dataview.h
index 1a974fd8c..75552f279 100644
--- a/kexi/plugins/tables/kexitabledesigner_dataview.h
+++ b/kexi/plugins/tables/kexitabledesigner_dataview.h
@@ -29,7 +29,7 @@ class KexiTableDesigner_DataView : public KexiDataTable
   TQ_OBJECT
 
 	public:
-		KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *tqparent);
+		KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *parent);
 
 		virtual ~KexiTableDesigner_DataView();
 
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 0e743bd10..84ea686c6 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -104,8 +104,8 @@ static TQVariant tryCastTQVariant( const TQVariant& fromVal, TQVariant::Type toT
 }
 
 
-KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *tqparent)
- : KexiDataTable(win, tqparent, "KexiTableDesignerView", false/*not db-aware*/)
+KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *parent)
+ : KexiDataTable(win, parent, "KexiTableDesignerView", false/*not db-aware*/)
  , KexiTableDesignerInterface()
  , d( new KexiTableDesignerViewPrivate(this) )
 {
diff --git a/kexi/plugins/tables/kexitabledesignerview.h b/kexi/plugins/tables/kexitabledesignerview.h
index b7ff7a234..13ce495d5 100644
--- a/kexi/plugins/tables/kexitabledesignerview.h
+++ b/kexi/plugins/tables/kexitabledesignerview.h
@@ -60,7 +60,7 @@ class KexiTableDesignerView : public KexiDataTable, public KexiTableDesignerInte
 
 	public:
 		/*! Creates a new alter table dialog. */
-		KexiTableDesignerView(KexiMainWindow *win, TQWidget *tqparent);
+		KexiTableDesignerView(KexiMainWindow *win, TQWidget *parent);
 
 		virtual ~KexiTableDesignerView();
 
@@ -219,7 +219,7 @@ class KexiTableDesignerView : public KexiDataTable, public KexiTableDesignerInte
 		 Assigns primary key icon and value for property set \a propertySet, 
 		 and deselects it from previous pkey's row. 
 		 \a aWasPKey is internal. 
-		 If \a commandGroup is not 0, it is used as tqparent group for storing actions' history. */
+		 If \a commandGroup is not 0, it is used as parent group for storing actions' history. */
 		void switchPrimaryKey(KoProperty::Set &propertySet, bool set, bool aWasPKey = false,
 			CommandGroup* commandGroup = 0);
 
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 1ee3d0492..4efd237aa 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -54,8 +54,8 @@ class KexiTablePart::Private
 		TQGuardedPtr<KexiLookupColumnPage> lookupColumnPage;
 };
 
-KexiTablePart::KexiTablePart(TQObject *tqparent, const char *name, const TQStringList &l)
- : KexiPart::Part(tqparent, name, l)
+KexiTablePart::KexiTablePart(TQObject *parent, const char *name, const TQStringList &l)
+ : KexiPart::Part(parent, name, l)
  , d(new Private())
 {
 	// REGISTERED ID:
@@ -96,7 +96,7 @@ KexiDialogTempData* KexiTablePart::createTempData(KexiDialogBase* dialog)
 	return new KexiTablePart::TempData(TQT_TQOBJECT(dialog));
 }
 
-KexiViewBase* KexiTablePart::createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+KexiViewBase* KexiTablePart::createView(TQWidget *parent, KexiDialogBase* dialog, 
 	KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*)
 {
 	KexiMainWindow *win = dialog->mainWin();
@@ -111,7 +111,7 @@ KexiViewBase* KexiTablePart::createView(TQWidget *tqparent, KexiDialogBase* dial
 	}
 
 	if (viewMode == Kexi::DesignViewMode) {
-		KexiTableDesignerView *t = new KexiTableDesignerView(win, tqparent);
+		KexiTableDesignerView *t = new KexiTableDesignerView(win, parent);
 		return t;
 	}
 	else if (viewMode == Kexi::DataViewMode) {
@@ -119,7 +119,7 @@ KexiViewBase* KexiTablePart::createView(TQWidget *tqparent, KexiDialogBase* dial
 			return 0; //todo: message
 		//we're not setting table schema here -it will be forced to set 
 		// in KexiTableDesigner_DataView::afterSwitchFrom()
-		KexiTableDesigner_DataView *t = new KexiTableDesigner_DataView(win, tqparent);
+		KexiTableDesigner_DataView *t = new KexiTableDesigner_DataView(win, parent);
 		return t;
 	}
 	return 0;
@@ -171,7 +171,7 @@ KexiTablePart::dataSource()
 }
 #endif
 
-tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *tqparent, KexiDB::Connection& conn, 
+tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *parent, KexiDB::Connection& conn, 
 	KexiDB::TableSchema& table, const TQString& msg)
 {
 	TQPtrList<KexiDB::Connection::TableSchemaChangeListenerInterface>* listeners
@@ -185,7 +185,7 @@ tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *tqparent,
 			openedObjectsStr += TQString("<li>%1</li>").tqarg(it.current()->listenerInfoString);
 	}
 	openedObjectsStr += "</ul>";
-	int r = KMessageBox::questionYesNo(tqparent, 
+	int r = KMessageBox::questionYesNo(parent, 
 		"<p>"+msg+"</p><p>"+openedObjectsStr+"</p><p>"
 		+i18n("Do you want to close all windows for these objects?"), 
 		TQString(), KGuiItem(i18n("Close windows"),"fileclose"), KStdGuiItem::cancel());
@@ -278,8 +278,8 @@ KexiTableDataSource::cursor(KexiProject * /*project*/,
 
 //----------------
 
-KexiTablePart::TempData::TempData(TQObject* tqparent)
- : KexiDialogTempData(tqparent)
+KexiTablePart::TempData::TempData(TQObject* parent)
+ : KexiDialogTempData(parent)
  , table(0)
  , tableSchemaChangedInPreviousView(true /*to force reloading on startup*/ )
 {
diff --git a/kexi/plugins/tables/kexitablepart.h b/kexi/plugins/tables/kexitablepart.h
index 688251380..6042f365d 100644
--- a/kexi/plugins/tables/kexitablepart.h
+++ b/kexi/plugins/tables/kexitablepart.h
@@ -38,7 +38,7 @@ class KexiTablePart : public KexiPart::Part
   TQ_OBJECT
 
 	public:
-		KexiTablePart(TQObject *tqparent, const char *name, const TQStringList &);
+		KexiTablePart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~KexiTablePart();
 
 		virtual bool remove(KexiMainWindow *win, KexiPart::Item &item);
@@ -51,7 +51,7 @@ class KexiTablePart : public KexiPart::Part
 		class TempData : public KexiDialogTempData
 		{
 			public:
-				TempData(TQObject* tqparent);
+				TempData(TQObject* parent);
 				KexiDB::TableSchema *table;
 				/*! true, if \a table member has changed in previous view. Used on view switching.
 				 We're checking this flag to see if we should refresh data for DataViewMode. */
@@ -59,7 +59,7 @@ class KexiTablePart : public KexiPart::Part
 		};
 
 		static tristate askForClosingObjectsUsingTableSchema(
-			TQWidget *tqparent, KexiDB::Connection& conn, 
+			TQWidget *parent, KexiDB::Connection& conn, 
 			KexiDB::TableSchema& table, const TQString& msg);
 
 		virtual TQString i18nMessage(const TQCString& englishMessage, 
@@ -70,7 +70,7 @@ class KexiTablePart : public KexiPart::Part
 	protected:
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, 
+		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
 		virtual void initPartActions();
diff --git a/kexi/tests/gui/finddialog/kexifinddialog.cpp b/kexi/tests/gui/finddialog/kexifinddialog.cpp
index 5482c0727..72266fb29 100644
--- a/kexi/tests/gui/finddialog/kexifinddialog.cpp
+++ b/kexi/tests/gui/finddialog/kexifinddialog.cpp
@@ -27,8 +27,8 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-KexiFindDialog::KexiFindDialog( bool replaceMode, TQWidget* tqparent, const char* name, bool modal )
- : KexiFindDialogBase(tqparent, name, modal)
+KexiFindDialog::KexiFindDialog( bool replaceMode, TQWidget* parent, const char* name, bool modal )
+ : KexiFindDialogBase(parent, name, modal)
  , m_replaceMode(true)
 {
 	m_btnFind->setIconSet(KStdGuiItem::find().iconSet());
diff --git a/kexi/tests/gui/finddialog/kexifinddialog.h b/kexi/tests/gui/finddialog/kexifinddialog.h
index b1cd4a5c9..63a70b5d3 100644
--- a/kexi/tests/gui/finddialog/kexifinddialog.h
+++ b/kexi/tests/gui/finddialog/kexifinddialog.h
@@ -31,7 +31,7 @@ class KexiFindDialog : public KexiFindDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiFindDialog( bool replaceMode, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE );
+		KexiFindDialog( bool replaceMode, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE );
 		virtual ~KexiFindDialog();
 
 #if 0
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 0f8b5e02a..4c279382d 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -68,8 +68,8 @@ KexiBrowserView::KexiBrowserView(KexiMainWindow *mainWin)
 	setFocusProxy(m_browser);
 }*/
 
-KexiBrowser::KexiBrowser(TQWidget* tqparent, KexiMainWindow *mainWin, int features)
- : TQWidget(tqparent, "KexiBrowser")
+KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features)
+ : TQWidget(parent, "KexiBrowser")
  , m_mainWin(mainWin)
  , m_features(features)
  , m_actions( new KActionCollection(this) )
@@ -370,18 +370,18 @@ KexiBrowserItem *KexiBrowser::addGroup(KexiPart::Info& info)
 KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item)
 {
 	//part object for this item
-	KexiBrowserItem *tqparent = item.mimeType().isEmpty() ? 0 : m_baseItems.find(item.mimeType().lower());
-	return addItem(item, tqparent, tqparent->info());
+	KexiBrowserItem *parent = item.mimeType().isEmpty() ? 0 : m_baseItems.find(item.mimeType().lower());
+	return addItem(item, parent, parent->info());
 }
 
-KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item, KexiBrowserItem *tqparent, KexiPart::Info* info)
+KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item, KexiBrowserItem *parent, KexiPart::Info* info)
 {
-//	if (!tqparent) //TODO: add "Other" part group for that
+//	if (!parent) //TODO: add "Other" part group for that
 	//	return 0;
-//	kdDebug() << "KexiBrowser::addItem() found tqparent:" << tqparent << endl;
+//	kdDebug() << "KexiBrowser::addItem() found parent:" << parent << endl;
 	KexiBrowserItem *bitem;
-	if (tqparent)
-		bitem = new KexiBrowserItem(tqparent, info, &item);
+	if (parent)
+		bitem = new KexiBrowserItem(parent, info, &item);
 	else
 		bitem = new KexiBrowserItem(m_list, info, &item);
 	m_normalItems.insert(item.identifier(), bitem);
@@ -400,7 +400,7 @@ KexiBrowser::slotRemoveItem(const KexiPart::Item &item)
 	TQListViewItem *new_item_to_select = 0;
 	if (it==to_remove) {//compute item to select if current one will be removed
 		new_item_to_select = it->itemBelow();//nearest item to select
-		if (!new_item_to_select || new_item_to_select->tqparent()!=it->tqparent()) {
+		if (!new_item_to_select || new_item_to_select->parent()!=it->parent()) {
 			new_item_to_select = it->itemAbove();
 		}
 	}
@@ -421,7 +421,7 @@ KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQ
 		pm = m_itemPopup;
 		//update popup title
 		TQString title_text = bit->text(0).stripWhiteSpace();
-		KexiBrowserItem *par_it = static_cast<KexiBrowserItem*>(bit->tqparent());
+		KexiBrowserItem *par_it = static_cast<KexiBrowserItem*>(bit->parent());
 		KexiPart::Part* par_part = 0;
 		if (par_it && par_it->info() && ((par_part = Kexi::partManager().part(par_it->info()))) && !par_part->instanceCaption().isEmpty()) {
 			//add part type name
@@ -471,7 +471,7 @@ KexiBrowser::slotSelectionChanged(TQListViewItem* i)
 		return;
 	KexiPart::Part* part = Kexi::partManager().part(it->info());
 	if (!part) {
-		it = static_cast<KexiBrowserItem*>(it->tqparent());
+		it = static_cast<KexiBrowserItem*>(it->parent());
 		if (it) {
 			part = Kexi::partManager().part(it->info());
 		}
@@ -710,7 +710,7 @@ void KexiBrowser::itemRenameDone()
 		m_list->nameEndsWithAsterisk = false;
 	}
 	it->setText(0, txt);
-	it->tqparent()->sort();
+	it->parent()->sort();
 	setFocus();
 }
 
@@ -852,8 +852,8 @@ void KexiBrowser::clear()
 }
 
 //--------------------------------------------
-KexiBrowserListView::KexiBrowserListView(TQWidget *tqparent)
- : KListView(tqparent, "KexiBrowserListView")
+KexiBrowserListView::KexiBrowserListView(TQWidget *parent)
+ : KListView(parent, "KexiBrowserListView")
  , nameEndsWithAsterisk(false)
  , enableExecuteArea(true)
 {
diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h
index df51197a3..3f9347cb6 100644
--- a/kexi/widget/kexibrowser.h
+++ b/kexi/widget/kexibrowser.h
@@ -63,13 +63,13 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget
 				| SingleClickOpensItemOptionEnabled //!< the default
 		};
 
-		KexiBrowser(TQWidget* tqparent, KexiMainWindow *mainWin, int features = DefaultFeatures);
+		KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features = DefaultFeatures);
 		virtual ~KexiBrowser(); 
 
 		/*! Sets project \a prj for this browser. If \a partManagerErrorMessages is not NULL
 		 it will be set to error message if there's a problem with loading any KexiPart.
 		 If \a itemsMimeType is empty (the default), items of all mime types are displayed,
-		 items for only one mime type are displayed. In the latter case, no group (tqparent) 
+		 items for only one mime type are displayed. In the latter case, no group (parent) 
 		 items are displayed.
 		 Previous items are removed. */
 		void setProject(KexiProject* prj, const TQString& itemsMimeType = TQString(), 
@@ -151,7 +151,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget
 
 	protected:
 		void itemRenameDone();
-		KexiBrowserItem* addItem(KexiPart::Item& item, KexiBrowserItem *tqparent, KexiPart::Info* info);
+		KexiBrowserItem* addItem(KexiPart::Item& item, KexiBrowserItem *parent, KexiPart::Info* info);
 
 		KexiMainWindow *m_mainWin;
 		int m_features;
diff --git a/kexi/widget/kexibrowser_p.h b/kexi/widget/kexibrowser_p.h
index 4459daab2..d0cc55894 100644
--- a/kexi/widget/kexibrowser_p.h
+++ b/kexi/widget/kexibrowser_p.h
@@ -29,7 +29,7 @@ class KexiBrowserListView : public KListView
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiBrowserListView(TQWidget *tqparent);
+		KexiBrowserListView(TQWidget *parent);
 		~KexiBrowserListView();
 		
 		virtual bool isExecuteArea( const TQPoint& point );
diff --git a/kexi/widget/kexibrowseritem.cpp b/kexi/widget/kexibrowseritem.cpp
index 24f1d46c6..99b800957 100644
--- a/kexi/widget/kexibrowseritem.cpp
+++ b/kexi/widget/kexibrowseritem.cpp
@@ -24,8 +24,8 @@
 #include <kiconloader.h>
 #include <core/kexipartinfo.h>
 
-KexiBrowserItem::KexiBrowserItem(KListView *tqparent, KexiPart::Info *i)
- : KListViewItem(tqparent, i->groupName())
+KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i)
+ : KListViewItem(parent, i->groupName())
  , m_info(i)
  , m_item(0)
 {
@@ -36,8 +36,8 @@ KexiBrowserItem::KexiBrowserItem(KListView *tqparent, KexiPart::Info *i)
 	m_fifoSorting = 1; //because this is top level item
 }
 
-KexiBrowserItem::KexiBrowserItem(KListViewItem *tqparent, KexiPart::Info *i, KexiPart::Item *item)
- : KListViewItem(tqparent, item->name())
+KexiBrowserItem::KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item)
+ : KListViewItem(parent, item->name())
  , m_info(i)
  , m_item(item)
 {
@@ -45,8 +45,8 @@ KexiBrowserItem::KexiBrowserItem(KListViewItem *tqparent, KexiPart::Info *i, Kex
 	initItem();
 }
 
-KexiBrowserItem::KexiBrowserItem(KListView *tqparent, KexiPart::Info *i, KexiPart::Item *item)
- : KListViewItem(tqparent, item->name())
+KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item)
+ : KListViewItem(parent, item->name())
  , m_info(i)
  , m_item(item)
 {
@@ -63,8 +63,8 @@ void KexiBrowserItem::initItem()
 	m_fifoSorting = 0;
 	int sortKey = 0;
 	// set sorting key with FIFO order
-	if (tqparent()) {
-		sortKey = tqparent()->childCount();
+	if (parent()) {
+		sortKey = parent()->childCount();
 	} else if (listView()) {
 		sortKey = listView()->childCount();
 	}
diff --git a/kexi/widget/kexibrowseritem.h b/kexi/widget/kexibrowseritem.h
index a46f5a8df..9138dafda 100644
--- a/kexi/widget/kexibrowseritem.h
+++ b/kexi/widget/kexibrowseritem.h
@@ -37,14 +37,14 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public KListViewItem
 {
 	public:
 		//! Creates group item for part \a i
-		KexiBrowserItem(KListView *tqparent, KexiPart::Info *i);
+		KexiBrowserItem(KListView *parent, KexiPart::Info *i);
 
-		//! Creates item for object \a item defined by part \a i for \a tqparent
-		KexiBrowserItem(KListViewItem *tqparent, KexiPart::Info *i, KexiPart::Item *item);
+		//! Creates item for object \a item defined by part \a i for \a parent
+		KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item);
 
-		//! Creates item for object \a item defined by part \a i, without tqparent 
+		//! Creates item for object \a item defined by part \a i, without parent 
 		//! (used in a case when KexiBrowser::itemsMimeType() is not empty)
-		KexiBrowserItem(KListView *tqparent, KexiPart::Info *i, KexiPart::Item *item);
+		KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item);
 
 		virtual ~KexiBrowserItem();
 
@@ -53,7 +53,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public KListViewItem
 		//! \return part info; should not be null.
 		KexiPart::Info *info() const { return m_info; }
 
-		//! \return part item. Can be null if the browser item is a "folder", i.e. a tqparent node.
+		//! \return part item. Can be null if the browser item is a "folder", i.e. a parent node.
 		KexiPart::Item* item() const { return m_item; }
 
 	protected:
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index 1b66f6a87..ff277e7da 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -27,8 +27,8 @@
 #include <kcharsets.h>
 
 KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( 
-	TQWidget* tqparent, const TQString& selectedEncoding )
- : KComboBox( tqparent, "KexiCharacterEncodingComboBox" )
+	TQWidget* parent, const TQString& selectedEncoding )
+ : KComboBox( parent, "KexiCharacterEncodingComboBox" )
  , m_defaultEncodingAdded(false)
 {
 	TQString defaultEncoding(TQString::tqfromLatin1(KGlobal::locale()->encoding()));
diff --git a/kexi/widget/kexicharencodingcombobox.h b/kexi/widget/kexicharencodingcombobox.h
index fd147cece..eba25d6df 100644
--- a/kexi/widget/kexicharencodingcombobox.h
+++ b/kexi/widget/kexicharencodingcombobox.h
@@ -30,7 +30,7 @@ class KEXIEXTWIDGETS_EXPORT KexiCharacterEncodingComboBox : public KComboBox
 	public:
 		//! Constructs a new combobox. \a selectedEncoding can be provided to preselect encoding.
 		//! If it is not provided, default encoding is selected for current system settings.
-		KexiCharacterEncodingComboBox( TQWidget* tqparent = 0, 
+		KexiCharacterEncodingComboBox( TQWidget* parent = 0, 
 			const TQString& selectedEncoding = TQString() );
 		~KexiCharacterEncodingComboBox();
 
diff --git a/kexi/widget/kexicustompropertyfactory.cpp b/kexi/widget/kexicustompropertyfactory.cpp
index e89727d06..7936ddb13 100644
--- a/kexi/widget/kexicustompropertyfactory.cpp
+++ b/kexi/widget/kexicustompropertyfactory.cpp
@@ -29,8 +29,8 @@ using namespace KoProperty;
 class PixmapIdCustomProperty : public CustomProperty
 {
 	public:
-		PixmapIdCustomProperty(Property *tqparent)
-			: CustomProperty(tqparent) {
+		PixmapIdCustomProperty(Property *parent)
+			: CustomProperty(parent) {
 		}
 		virtual ~PixmapIdCustomProperty() {};
 		virtual void setValue(const TQVariant &value, bool rememberOldValue) { 
@@ -47,8 +47,8 @@ class PixmapIdCustomProperty : public CustomProperty
 class IdentifierCustomProperty : public CustomProperty
 {
 	public:
-		IdentifierCustomProperty(Property *tqparent)
-			: CustomProperty(tqparent) {
+		IdentifierCustomProperty(Property *parent)
+			: CustomProperty(parent) {
 		}
 		virtual ~IdentifierCustomProperty() {};
 		virtual void setValue(const TQVariant &value, bool rememberOldValue)
@@ -66,8 +66,8 @@ class IdentifierCustomProperty : public CustomProperty
 
 //---------------
 
-KexiCustomPropertyFactory::KexiCustomPropertyFactory(TQObject* tqparent) 
-: CustomPropertyFactory(tqparent)
+KexiCustomPropertyFactory::KexiCustomPropertyFactory(TQObject* parent) 
+: CustomPropertyFactory(parent)
 {
 }
 
@@ -75,13 +75,13 @@ KexiCustomPropertyFactory::~KexiCustomPropertyFactory()
 {
 }
 
-CustomProperty* KexiCustomPropertyFactory::createCustomProperty(Property *tqparent)
+CustomProperty* KexiCustomPropertyFactory::createCustomProperty(Property *parent)
 {
-	const int type = tqparent->type();
+	const int type = parent->type();
 	if (type==(int)KexiCustomPropertyFactory::PixmapId)
-		return new PixmapIdCustomProperty(tqparent);
+		return new PixmapIdCustomProperty(parent);
 	else if (type==(int)KexiCustomPropertyFactory::Identifier)
-		return new IdentifierCustomProperty(tqparent);
+		return new IdentifierCustomProperty(parent);
 	return 0;
 }
 
diff --git a/kexi/widget/kexicustompropertyfactory.h b/kexi/widget/kexicustompropertyfactory.h
index d1550947e..58efe5df1 100644
--- a/kexi/widget/kexicustompropertyfactory.h
+++ b/kexi/widget/kexicustompropertyfactory.h
@@ -35,10 +35,10 @@ class KEXIEXTWIDGETS_EXPORT KexiCustomPropertyFactory : public KoProperty::Custo
 		//! Called once to register all propert and editor types provided by this factory.
 		static void init();
 
-		KexiCustomPropertyFactory(TQObject* tqparent);
+		KexiCustomPropertyFactory(TQObject* parent);
 		virtual ~KexiCustomPropertyFactory();
 
-		virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property *tqparent);
+		virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property *parent);
 		virtual KoProperty::Widget* createCustomWidget(KoProperty::Property *prop);
 };
 
diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp
index f5fbb90a8..20e85b04f 100644
--- a/kexi/widget/kexicustompropertyfactory_p.cpp
+++ b/kexi/widget/kexicustompropertyfactory_p.cpp
@@ -27,8 +27,8 @@
 using namespace KoProperty;
 
 KexiImagePropertyEdit::KexiImagePropertyEdit(
-	Property *property, TQWidget *tqparent, const char *name)
- : PixmapEdit(property, tqparent, name)
+	Property *property, TQWidget *parent, const char *name)
+ : PixmapEdit(property, parent, name)
  , m_id(0)
 {
 }
@@ -79,8 +79,8 @@ void KexiImagePropertyEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, con
 //----------------------------------------------------------------
 
 KexiIdentifierPropertyEdit::KexiIdentifierPropertyEdit(
-	Property *property, TQWidget *tqparent, const char *name)
- : StringEdit(property, tqparent, name)
+	Property *property, TQWidget *parent, const char *name)
+ : StringEdit(property, parent, name)
 {
 	m_edit->setValidator( 
 		new KexiUtils::IdentifierValidator(TQT_TQOBJECT(m_edit), "KexiIdentifierPropertyEdit Validator") );
diff --git a/kexi/widget/kexicustompropertyfactory_p.h b/kexi/widget/kexicustompropertyfactory_p.h
index 49a4066be..792f424c4 100644
--- a/kexi/widget/kexicustompropertyfactory_p.h
+++ b/kexi/widget/kexicustompropertyfactory_p.h
@@ -32,7 +32,7 @@ class KexiImagePropertyEdit : public KoProperty::PixmapEdit
 
 	public:
 		KexiImagePropertyEdit(KoProperty::Property *property, 
-			TQWidget *tqparent=0, const char *name=0);
+			TQWidget *parent=0, const char *name=0);
 		virtual ~KexiImagePropertyEdit();
 
 		virtual TQVariant value() const;
@@ -61,7 +61,7 @@ class KexiIdentifierPropertyEdit : public KoProperty::StringEdit
 
 	public:
 		KexiIdentifierPropertyEdit(KoProperty::Property *property, 
-			TQWidget *tqparent=0, const char *name=0);
+			TQWidget *parent=0, const char *name=0);
 		virtual ~KexiIdentifierPropertyEdit();
 
 		/*! Reimplemented: sets \a value but it is converted to identifier
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index 13e308c8a..113f8be47 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -27,8 +27,8 @@
 
 #include <kpopupmenu.h>
 
-KexiDataAwareView::KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
- : KexiViewBase(mainWin, tqparent, name)
+KexiDataAwareView::KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+ : KexiViewBase(mainWin, parent, name)
  , KexiSearchAndReplaceViewInterface()
  , m_internalView(0)
  , m_actionClient(0)
diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h
index 98124f5ac..5cc76e974 100644
--- a/kexi/widget/kexidataawareview.h
+++ b/kexi/widget/kexidataawareview.h
@@ -45,7 +45,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase,
   TQ_OBJECT
 
 	public:
-		KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 
 		TQWidget* mainWidget();
 
diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp
index 0db52c9d1..f830926f3 100644
--- a/kexi/widget/kexidatasourcecombobox.cpp
+++ b/kexi/widget/kexidatasourcecombobox.cpp
@@ -69,8 +69,8 @@ class KexiDataSourceComboBox::Private
 
 //------------------------
 
-KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *tqparent, const char *name)
- : KComboBox(true/*rw*/, tqparent, name)
+KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *parent, const char *name)
+ : KComboBox(true/*rw*/, parent, name)
  , d(new Private())
 {
 	setInsertionPolicy(NoInsertion);
diff --git a/kexi/widget/kexidatasourcecombobox.h b/kexi/widget/kexidatasourcecombobox.h
index 6f9f58ed4..0ccb663ad 100644
--- a/kexi/widget/kexidatasourcecombobox.h
+++ b/kexi/widget/kexidatasourcecombobox.h
@@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDataSourceComboBox : public KComboBox
   TQ_OBJECT
 
 	public:
-		KexiDataSourceComboBox(TQWidget *tqparent, const char *name=0);
+		KexiDataSourceComboBox(TQWidget *parent, const char *name=0);
 		~KexiDataSourceComboBox();
 
 		//! \return global project that is used to retrieve schema informationm for this combo box.
diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp
index e0f2dd1b3..09680b148 100644
--- a/kexi/widget/kexidatatable.cpp
+++ b/kexi/widget/kexidatatable.cpp
@@ -34,10 +34,10 @@
 #include "kexidatatable.h"
 #include "kexidialogbase.h"
 
-KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, 
+KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, 
 	const char *name, bool dbAware)
-// : KexiViewBase(mainWin, tqparent, name)
- : KexiDataAwareView( mainWin, tqparent, name )
+// : KexiViewBase(mainWin, parent, name)
+ : KexiDataAwareView( mainWin, parent, name )
 {
 	KexiTableView *view;
 	if (dbAware)
@@ -50,9 +50,9 @@ KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent,
 	KexiDataAwareView::init( view, view, view );
 }
 
-KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, 
+KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, 
 	KexiDB::Cursor *cursor, const char *name)
- : KexiDataAwareView( mainWin, tqparent, name )
+ : KexiDataAwareView( mainWin, parent, name )
 {
 	KexiTableView *view = new KexiDataTableView(this, "view", cursor);
 	KexiDataAwareView::init( view, view, view );
diff --git a/kexi/widget/kexidatatable.h b/kexi/widget/kexidatatable.h
index ccc5c6c30..1cf392e19 100644
--- a/kexi/widget/kexidatatable.h
+++ b/kexi/widget/kexidatatable.h
@@ -54,12 +54,12 @@ class KEXIEXTWIDGETS_EXPORT KexiDataTable : public KexiDataAwareView
 		 Otherwise, table will be not-db-aware, 
 		  and KexiTableView is used internally. In the latter case,
 		  data can be set by calling tableView()->setData(KexiTableViewData* data). */
-		KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0, 
+		KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0, 
 			bool dbAware = true);
 
 		/*! CTOR2: Creates db-aware, table view initialized with \a cursor. 
 		 KexiDataTableView is used internally. */
-		KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, 
+		KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, 
 			KexiDB::Cursor *cursor, const char *name = 0);
 
 		virtual ~KexiDataTable();
diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp
index a048e9292..78b67c8d6 100644
--- a/kexi/widget/kexidbconnectionwidget.cpp
+++ b/kexi/widget/kexidbconnectionwidget.cpp
@@ -65,8 +65,8 @@ class KexiDBConnectionWidget::Private
 
 //---------
 
-KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* tqparent,  const char* name )
- : KexiDBConnectionWidgetBase( tqparent, name )
+KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent,  const char* name )
+ : KexiDBConnectionWidgetBase( parent, name )
  , d(new Private())
 {
 	iconLabel->setPixmap(DesktopIcon("network"));
@@ -221,8 +221,8 @@ void KexiDBConnectionWidget::slotCBToggled(bool on)
 
 //-----------
 
-KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* tqparent, const char* name )
- : KTabWidget( tqparent, name )
+KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const char* name )
+ : KTabWidget( parent, name )
 {
 	mainWidget = new KexiDBConnectionWidget( this, "mainWidget" );
 	mainWidget->tqlayout()->setMargin(KDialog::marginHint());
diff --git a/kexi/widget/kexidbconnectionwidget.h b/kexi/widget/kexidbconnectionwidget.h
index 72c49c894..db9bef115 100644
--- a/kexi/widget/kexidbconnectionwidget.h
+++ b/kexi/widget/kexidbconnectionwidget.h
@@ -39,7 +39,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionWidget : public KexiDBConnectionWidg
   TQ_OBJECT
 
 	public:
-		KexiDBConnectionWidget( TQWidget* tqparent = 0, const char* name = 0 );
+		KexiDBConnectionWidget( TQWidget* parent = 0, const char* name = 0 );
 		virtual ~KexiDBConnectionWidget();
 
 		/*! Sets project data \a data.
@@ -95,7 +95,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionTabWidget : public KTabWidget
   TQ_OBJECT
 
 	public:
-		KexiDBConnectionTabWidget( TQWidget* tqparent = 0, const char* name = 0 );
+		KexiDBConnectionTabWidget( TQWidget* parent = 0, const char* name = 0 );
 		virtual ~KexiDBConnectionTabWidget();
 
 		/*! Sets connection data \a data.
diff --git a/kexi/widget/kexidbdrivercombobox.cpp b/kexi/widget/kexidbdrivercombobox.cpp
index e083ac1c2..e17195769 100644
--- a/kexi/widget/kexidbdrivercombobox.cpp
+++ b/kexi/widget/kexidbdrivercombobox.cpp
@@ -23,9 +23,9 @@
 
 #include <kiconloader.h>
 
-KexiDBDriverComboBox::KexiDBDriverComboBox(TQWidget* tqparent, const KexiDB::Driver::InfoMap& driversInfo, 
+KexiDBDriverComboBox::KexiDBDriverComboBox(TQWidget* parent, const KexiDB::Driver::InfoMap& driversInfo, 
 	Options options)
- : KComboBox(tqparent, "KexiDBDriverComboBox")
+ : KComboBox(parent, "KexiDBDriverComboBox")
 {
 	//retrieve list of drivers and sort it: file-based first, then server-based
 	TQStringList captionsForFileBasedDrivers, captionsForServerBasedDrivers;
diff --git a/kexi/widget/kexidbdrivercombobox.h b/kexi/widget/kexidbdrivercombobox.h
index cdd18f769..31b4eb041 100644
--- a/kexi/widget/kexidbdrivercombobox.h
+++ b/kexi/widget/kexidbdrivercombobox.h
@@ -65,7 +65,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBDriverComboBox : public KComboBox
 		    If \a includeFileBasedDrivers is set to false, then only those drivers
 		    that are for database servers (those which have X-Kexi-DriverType=Network
 		    in their .desktop file) are shown. */
-		KexiDBDriverComboBox(TQWidget* tqparent, const KexiDB::Driver::InfoMap& driversInfo, 
+		KexiDBDriverComboBox(TQWidget* parent, const KexiDB::Driver::InfoMap& driversInfo, 
 			Options options = ShowAll );
 
 		~KexiDBDriverComboBox();
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index ca2480f61..b07dc9975 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -30,10 +30,10 @@
 #include "kexidatasourcewizard.h"
 #include "kexidswelcome.h"
 
-KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *tqparent)
- : TQWidget(tqparent)
+KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent)
+ : TQWidget(parent)
 {
-	m_wiz = tqparent;
+	m_wiz = 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);
diff --git a/kexi/widget/kexidswelcome.h b/kexi/widget/kexidswelcome.h
index dc7cbd14d..978beaad1 100644
--- a/kexi/widget/kexidswelcome.h
+++ b/kexi/widget/kexidswelcome.h
@@ -35,7 +35,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDSWelcome : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiDSWelcome(KexiDataSourceWizard *tqparent);
+		KexiDSWelcome(KexiDataSourceWizard *parent);
 		~KexiDSWelcome();
 
 	protected slots:
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index f45faaa10..07627f32c 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -81,8 +81,8 @@ class KexiEditorPrivate {
 #endif
 };
 
-KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
-	: KexiViewBase(mainWin, tqparent, name)
+KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+	: KexiViewBase(mainWin, parent, name)
 	, d(new KexiEditorPrivate())
 {
 	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
diff --git a/kexi/widget/kexieditor.h b/kexi/widget/kexieditor.h
index 022b0dd96..2c659f01d 100644
--- a/kexi/widget/kexieditor.h
+++ b/kexi/widget/kexieditor.h
@@ -48,12 +48,12 @@ class KEXIEXTWIDGETS_EXPORT KexiEditor : public KexiViewBase
 		* 
 		* \param mainWin The \a KexiMainWindow instance this KexiEditor
 		*        belongs too.
-		* \param tqparent The tqparent \a TQWidget this KexiEditor is child
+		* \param parent The parent \a TQWidget this KexiEditor is child
 		*        of.  You don't need to free the KexiEditor cause TQt 
 		*        will handle that for us.
 		* \param name The name this KexiEditor has. Used only for debugging.
 		*/
-		KexiEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 
 		/**
 		* Destructor.
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index 0439a178e..e1afd1f86 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -70,8 +70,8 @@ class KexiFieldComboBox::Private
 
 //------------------------
 
-KexiFieldComboBox::KexiFieldComboBox(TQWidget *tqparent, const char *name)
- : KComboBox(true/*rw*/, tqparent, name)
+KexiFieldComboBox::KexiFieldComboBox(TQWidget *parent, const char *name)
+ : KComboBox(true/*rw*/, parent, name)
  , d(new Private())
 {
 	setInsertionPolicy(NoInsertion);
diff --git a/kexi/widget/kexifieldcombobox.h b/kexi/widget/kexifieldcombobox.h
index 9619f4073..8785b73bb 100644
--- a/kexi/widget/kexifieldcombobox.h
+++ b/kexi/widget/kexifieldcombobox.h
@@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldComboBox : public KComboBox
   TQ_OBJECT
 
 	public:
-		KexiFieldComboBox(TQWidget *tqparent, const char *name = 0);
+		KexiFieldComboBox(TQWidget *parent, const char *name = 0);
 		virtual ~KexiFieldComboBox();
 
 //		/*! Sets table or query schema \a schema. 
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index e9796abf1..521b1ce35 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -42,8 +42,8 @@
 #include <kexidragobjects.h>
 #include <kexiutils/utils.h>
 
-KexiFieldListView::KexiFieldListView(TQWidget *tqparent, const char *name, int options)
- : KListView(tqparent, name)
+KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int options)
+ : KListView(parent, name)
  , m_schema(0)
  , m_keyIcon(SmallIcon("key"))
  , m_noIcon(KexiUtils::emptyIcon(KIcon::Small))
diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h
index e133aeae1..50d94dbac 100644
--- a/kexi/widget/kexifieldlistview.h
+++ b/kexi/widget/kexifieldlistview.h
@@ -45,7 +45,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView
 			AllowMultiSelection = 4 //!< if set, multiple selection is allowed
 		};
 
-		KexiFieldListView(TQWidget *tqparent, const char *name = 0, 
+		KexiFieldListView(TQWidget *parent, const char *name = 0, 
 			int options = ShowDataTypes | AllowMultiSelection );
 		virtual ~KexiFieldListView();
 
diff --git a/kexi/widget/kexifilterdlg.cpp b/kexi/widget/kexifilterdlg.cpp
index aec34dc42..e41681ab3 100644
--- a/kexi/widget/kexifilterdlg.cpp
+++ b/kexi/widget/kexifilterdlg.cpp
@@ -30,8 +30,8 @@
 #include "kexifilterdlg.h"
 #include "kexiquerydesignersqleditor.h"
 
-KexiFilterDlg::KexiFilterDlg(KexiProject *project, TQWidget *tqparent, const char *name)
- : TQDialog(tqparent, name)
+KexiFilterDlg::KexiFilterDlg(KexiProject *project, TQWidget *parent, const char *name)
+ : TQDialog(parent, name)
 {
 	m_project = project;
 
diff --git a/kexi/widget/kexifilterdlg.h b/kexi/widget/kexifilterdlg.h
index 4a3d7e79d..a92824e2b 100644
--- a/kexi/widget/kexifilterdlg.h
+++ b/kexi/widget/kexifilterdlg.h
@@ -33,7 +33,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFilterDlg : public TQDialog
   TQ_OBJECT
 
 	public:
-		KexiFilterDlg(KexiProject *p, TQWidget *tqparent=0, const char *name=0);
+		KexiFilterDlg(KexiProject *p, TQWidget *parent=0, const char *name=0);
 		~KexiFilterDlg();
 
 		TQPushButton	*createMiniButton(const TQString &text);
diff --git a/kexi/widget/kexiprjtypeselector.cpp b/kexi/widget/kexiprjtypeselector.cpp
index 94a62e0a8..2717e0e9e 100644
--- a/kexi/widget/kexiprjtypeselector.cpp
+++ b/kexi/widget/kexiprjtypeselector.cpp
@@ -23,8 +23,8 @@
 #include <kmimetype.h>
 #include <kexidb/driver.h>
 
-KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* tqparent )
-	: KexiPrjTypeSelectorBase( tqparent, "KexiPrjTypeSelector" )
+KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* parent )
+	: KexiPrjTypeSelectorBase( parent, "KexiPrjTypeSelector" )
 {
 	TQString none;
 	icon_file->setPixmap( 
diff --git a/kexi/widget/kexiprjtypeselector.h b/kexi/widget/kexiprjtypeselector.h
index 13e464842..717ad7243 100644
--- a/kexi/widget/kexiprjtypeselector.h
+++ b/kexi/widget/kexiprjtypeselector.h
@@ -29,7 +29,7 @@ class KEXIEXTWIDGETS_EXPORT KexiPrjTypeSelector : public KexiPrjTypeSelectorBase
   TQ_OBJECT
 
 	public:
-		KexiPrjTypeSelector( TQWidget* tqparent = 0 );
+		KexiPrjTypeSelector( TQWidget* parent = 0 );
 		~KexiPrjTypeSelector();
 
 	protected slots:
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index 5c36cfb09..02b050b84 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -30,8 +30,8 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* tqparent, const char* name)
- : TQWidget(tqparent, name)
+KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
+ : TQWidget(parent, name)
 {
 	TQHBoxLayout *hlyr = new TQHBoxLayout(this);
 	m_objectIconLabel = new TQLabel(this);
@@ -103,8 +103,8 @@ class KexiPropertyEditorView::Private
 
 //------------------------------
 
-KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* tqparent)
-	: TQWidget(tqparent, "KexiPropertyEditorView")
+KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* parent)
+	: TQWidget(parent, "KexiPropertyEditorView")
 	, d(new Private())
 {
 	setCaption(i18n("Properties"));
diff --git a/kexi/widget/kexipropertyeditorview.h b/kexi/widget/kexipropertyeditorview.h
index 79adb9e05..66cc0ac7e 100644
--- a/kexi/widget/kexipropertyeditorview.h
+++ b/kexi/widget/kexipropertyeditorview.h
@@ -47,7 +47,7 @@ namespace KoProperty {
 class KEXIEXTWIDGETS_EXPORT KexiObjectInfoLabel : public TQWidget
 {
 	public:
-		KexiObjectInfoLabel(TQWidget* tqparent, const char* name = 0);
+		KexiObjectInfoLabel(TQWidget* parent, const char* name = 0);
 		~KexiObjectInfoLabel();
 
 		void setObjectClassIcon(const TQString& name);
@@ -85,7 +85,7 @@ class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* tqparent);
+		KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* parent);
 		virtual ~KexiPropertyEditorView();
 
 		/*! Helper function. Updates \a infoLabel widget by reusing properties provided 
diff --git a/kexi/widget/kexiquerydesignersqleditor.cpp b/kexi/widget/kexiquerydesignersqleditor.cpp
index 1c68138fa..d5e1f887d 100644
--- a/kexi/widget/kexiquerydesignersqleditor.cpp
+++ b/kexi/widget/kexiquerydesignersqleditor.cpp
@@ -22,8 +22,8 @@
 #include "kexiquerydesignersqleditor.h"
 
 KexiQueryDesignerSQLEditor::KexiQueryDesignerSQLEditor(
-	KexiMainWindow *mainWin, TQWidget *tqparent, const char *name)
-	: KexiEditor(mainWin, tqparent, name)
+	KexiMainWindow *mainWin, TQWidget *parent, const char *name)
+	: KexiEditor(mainWin, parent, name)
 {
 	setHighlightMode("sql");
 }
diff --git a/kexi/widget/kexiquerydesignersqleditor.h b/kexi/widget/kexiquerydesignersqleditor.h
index 9b1f9f9b7..a0bd4beed 100644
--- a/kexi/widget/kexiquerydesignersqleditor.h
+++ b/kexi/widget/kexiquerydesignersqleditor.h
@@ -33,7 +33,7 @@ class KEXIEXTWIDGETS_EXPORT KexiQueryDesignerSQLEditor : public KexiEditor
   TQ_OBJECT
 
 	public:
-		KexiQueryDesignerSQLEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
+		KexiQueryDesignerSQLEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		virtual ~KexiQueryDesignerSQLEditor();
 };
 
diff --git a/kexi/widget/kexiqueryparameters.cpp b/kexi/widget/kexiqueryparameters.cpp
index bcef819f1..04257ec28 100644
--- a/kexi/widget/kexiqueryparameters.cpp
+++ b/kexi/widget/kexiqueryparameters.cpp
@@ -29,7 +29,7 @@
 #include "utils/kexidatetimeformatter.h"
 
 //static
-TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent, 
+TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *parent, 
 	const KexiDB::Driver &driver, KexiDB::QuerySchema& querySchema, bool &ok)
 {
 	Q_UNUSED(driver);
@@ -48,7 +48,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 //! @todo add support for unsigned parameter here
 			KexiDB::getLimitsForType((*it).type, minValue, maxValue);
 			const int result = KInputDialog::getInteger(
-				caption, (*it).message, 0, minValue, maxValue, 1/*step*/, 10/*base*/, &ok, tqparent);
+				caption, (*it).message, 0, minValue, maxValue, 1/*step*/, 10/*base*/, &ok, parent);
 			if (!ok)
 				return TQValueList<TQVariant>(); //cancelled
 			values.append(result);
@@ -58,7 +58,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 			TQStringList list;
 			list << i18n("Boolean True - Yes", "Yes") << i18n("Boolean False - No", "No");
 			const TQString result = KInputDialog::getItem(
-				caption, (*it).message, list, 0/*current*/, false /*!editable*/, &ok, tqparent);
+				caption, (*it).message, list, 0/*current*/, false /*!editable*/, &ok, parent);
 			if (!ok || result.isEmpty())
 				return TQValueList<TQVariant>(); //cancelled
 			values.append( TQVariant( result==list.first(), 1 ) );
@@ -67,7 +67,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 		case KexiDB::Field::Date: {
 			KexiDateFormatter df;
 			const TQString result = KInputDialog::getText( 
-				caption, (*it).message, TQString(), &ok, tqparent, 0/*name*/, 
+				caption, (*it).message, TQString(), &ok, parent, 0/*name*/, 
 //! @todo add validator
 				0/*validator*/, df.inputMask() );
 			if (!ok)
@@ -79,7 +79,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 			KexiDateFormatter df;
 			KexiTimeFormatter tf;
 			const TQString result = KInputDialog::getText( 
-				caption, (*it).message, TQString(), &ok, tqparent, 0/*name*/, 
+				caption, (*it).message, TQString(), &ok, parent, 0/*name*/, 
 //! @todo add validator
 				0/*validator*/, dateTimeInputMask(df, tf) );
 			if (!ok)
@@ -90,7 +90,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 		case KexiDB::Field::Time: {
 			KexiTimeFormatter tf;
 			const TQString result = KInputDialog::getText( 
-				caption, (*it).message, TQString(), &ok, tqparent, 0/*name*/, 
+				caption, (*it).message, TQString(), &ok, parent, 0/*name*/, 
 //! @todo add validator
 				0/*validator*/, tf.inputMask() );
 			if (!ok)
@@ -103,7 +103,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 			// KInputDialog::getDouble() does not work well, use getText and double validator
 			KDoubleValidator validator(0);
 			const TQString textResult = KInputDialog::getText( caption, (*it).message, TQString(), &ok, 
-				tqparent, 0, &validator);
+				parent, 0, &validator);
 			if (!ok || textResult.isEmpty())
 				return TQValueList<TQVariant>(); //cancelled
 //! @todo this value will be still rounded: consider storing them as a decimal type 
@@ -117,7 +117,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent,
 		case KexiDB::Field::Text:
 		case KexiDB::Field::LongText: {
 			const TQString result = KInputDialog::getText( 
-				caption, (*it).message, TQString(), &ok, tqparent);
+				caption, (*it).message, TQString(), &ok, parent);
 			if (!ok)
 				return TQValueList<TQVariant>(); //cancelled
 			values.append( result );
diff --git a/kexi/widget/kexiqueryparameters.h b/kexi/widget/kexiqueryparameters.h
index b80a37adb..986c1ce9c 100644
--- a/kexi/widget/kexiqueryparameters.h
+++ b/kexi/widget/kexiqueryparameters.h
@@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiQueryParameters
 	//! @todo support defaults 
 	//! @todo support validation rules, e.g. min/max value, unsigned
 	//! @todo support Enum type (list of strings, need support for keys and user-visible strings)
-		static TQValueList<TQVariant> getParameters(TQWidget *tqparent, const KexiDB::Driver &driver, 
+		static TQValueList<TQVariant> getParameters(TQWidget *parent, const KexiDB::Driver &driver, 
 			KexiDB::QuerySchema& querySchema, bool &ok);
 };
 
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index b88ad3ae4..db9dbb14f 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -44,8 +44,8 @@ class KexiScrollViewData
 static KStaticDeleter<KexiScrollViewData> KexiScrollView_data_deleter;
 KexiScrollViewData* KexiScrollView_data = 0;
 
-KexiScrollView::KexiScrollView(TQWidget *tqparent, bool preview)
- : TQScrollView(tqparent, "kexiscrollview", WStaticContents)
+KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
+ : TQScrollView(parent, "kexiscrollview", WStaticContents)
  , m_widget(0)
  , m_helpFont(font())
  , m_preview(preview)
diff --git a/kexi/widget/kexiscrollview.h b/kexi/widget/kexiscrollview.h
index 92615cf34..1fccdbd6e 100644
--- a/kexi/widget/kexiscrollview.h
+++ b/kexi/widget/kexiscrollview.h
@@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiScrollView : public TQScrollView
   TQ_OBJECT
 
 	public:
-		KexiScrollView(TQWidget *tqparent, bool preview);
+		KexiScrollView(TQWidget *parent, bool preview);
 		virtual ~KexiScrollView();
 
 		void setWidget(TQWidget *w);
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index 7bc3fe5f8..7e6989f36 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -32,7 +32,7 @@
 class KexiSectionHeader::BoxLayout : public TQBoxLayout
 {
 	public:
-		BoxLayout( KexiSectionHeader* tqparent, Direction d, int margin = 0, 
+		BoxLayout( KexiSectionHeader* parent, Direction d, int margin = 0, 
 			int spacing = -1, const char * name = 0 );
 		virtual void addItem( TQLayoutItem * item );
 		TQGuardedPtr<KexiViewBase> view;
@@ -56,8 +56,8 @@ class KexiSectionHeaderPrivate
 
 //==========================
 
-KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, TQWidget* tqparent )
-	: TQWidget(tqparent, "KexiSectionHeader")
+KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, TQWidget* parent )
+	: TQWidget(parent, "KexiSectionHeader")
 	, d( new KexiSectionHeaderPrivate() )
 {
 	d->orientation = o;
@@ -138,8 +138,8 @@ TQSize KexiSectionHeader::tqsizeHint() const
 
 //======================
 
-KexiSectionHeader::BoxLayout::BoxLayout( KexiSectionHeader* tqparent, Direction d, int margin, int spacing, const char * name )
- : TQBoxLayout(tqparent, d, margin, spacing, name )
+KexiSectionHeader::BoxLayout::BoxLayout( KexiSectionHeader* parent, Direction d, int margin, int spacing, const char * name )
+ : TQBoxLayout(parent, d, margin, spacing, name )
 {
 }
 
diff --git a/kexi/widget/kexisectionheader.h b/kexi/widget/kexisectionheader.h
index 9e8d12155..9ed31a35e 100644
--- a/kexi/widget/kexisectionheader.h
+++ b/kexi/widget/kexisectionheader.h
@@ -32,7 +32,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSectionHeader : public TQWidget
 		class BoxLayout;
 
 		KexiSectionHeader(const TQString &caption, Qt::Orientation o, 
-			TQWidget* tqparent = 0 );
+			TQWidget* parent = 0 );
 
 		virtual ~KexiSectionHeader();
 
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 94a088a05..81bab0c62 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -28,24 +28,24 @@
 
 #include <core/kexi.h>
 
-KexiSmallToolButton::KexiSmallToolButton(TQWidget* tqparent, const TQString& text,
+KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, const TQString& text,
 	const TQString& icon, const char* name)
- : TQToolButton(tqparent, name)
+ : TQToolButton(parent, name)
 {
 	init();
 	update(text, SmallIconSet(icon));
 }
 
-KexiSmallToolButton::KexiSmallToolButton(TQWidget* tqparent, const TQString& text,
+KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, const TQString& text,
 	const TQIconSet& iconSet, const char* name)
- : TQToolButton(tqparent, name)
+ : TQToolButton(parent, name)
 {
 	init();
 	update(text, iconSet);
 }
 
-KexiSmallToolButton::KexiSmallToolButton(TQWidget* tqparent, KAction* action)
- : TQToolButton(tqparent, action->name())
+KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, KAction* action)
+ : TQToolButton(parent, action->name())
  , m_action(action)
 {
 	init();
diff --git a/kexi/widget/kexismalltoolbutton.h b/kexi/widget/kexismalltoolbutton.h
index 90ba7e5e0..53efb0d16 100644
--- a/kexi/widget/kexismalltoolbutton.h
+++ b/kexi/widget/kexismalltoolbutton.h
@@ -32,13 +32,13 @@ class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public TQToolButton
   TQ_OBJECT
 
 	public:
-		KexiSmallToolButton(TQWidget* tqparent, const TQString& text, 
+		KexiSmallToolButton(TQWidget* parent, const TQString& text, 
 			const TQString& icon = TQString(), const char* name = 0);
 
-		KexiSmallToolButton(TQWidget* tqparent, const TQString& text, 
+		KexiSmallToolButton(TQWidget* parent, const TQString& text, 
 			const TQIconSet& iconSet, const char* name = 0);
 
-		KexiSmallToolButton(TQWidget* tqparent, KAction *action);
+		KexiSmallToolButton(TQWidget* parent, KAction *action);
 		
 		virtual ~KexiSmallToolButton();
 
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index fecc5b769..0aeddca46 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -40,8 +40,8 @@
 #include "pixmapcollection.h"
 
 /// Pixmap Collection
-PixmapCollection::PixmapCollection(const TQString &collectionName, TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+PixmapCollection::PixmapCollection(const TQString &collectionName, TQObject *parent, const char *name)
+ : TQObject(parent, name)
 {
 	m_name = collectionName;
 }
@@ -150,8 +150,8 @@ PixmapCollection::load(TQDomNode node)
 }
 
 //// A dialog to load a KDE icon by its name
-LoadIconDialog::LoadIconDialog(TQWidget *tqparent)
-: KDialogBase(tqparent, "loadicon_dialog", true, i18n("Load KDE Icon by Name"), Ok|Cancel, Ok, false)
+LoadIconDialog::LoadIconDialog(TQWidget *parent)
+: KDialogBase(parent, "loadicon_dialog", true, i18n("Load KDE Icon by Name"), Ok|Cancel, Ok, false)
 {
 	TQFrame *frame = makeMainWidget();
 	TQGridLayout *l = new TQGridLayout(frame, 2, 3, 0, 6);
@@ -230,8 +230,8 @@ TQString LoadIconDialog::iconName()
 }
 
 /// Pixmap Collection Editor Dialog
-PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *tqparent)
-: KDialogBase(tqparent, "pixcollection_dialog", true,
+PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent)
+: KDialogBase(parent, "pixcollection_dialog", true,
 	i18n("Edit Pixmap Collection: %1").tqarg(collection->collectionName()), Close, Close, false)
 {
 	m_collection = collection;
@@ -372,8 +372,8 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p)
 }
 
 //// A Dialog to choose a pixmap from the PixmapCollection
-PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *tqparent)
-: KDialogBase(tqparent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()),
+PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent)
+: 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/pixmapcollection.h b/kexi/widget/pixmapcollection.h
index 3ac4c417e..833fbd983 100644
--- a/kexi/widget/pixmapcollection.h
+++ b/kexi/widget/pixmapcollection.h
@@ -46,7 +46,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject
   TQ_OBJECT
 
 	public:
-		PixmapCollection(const TQString &collectionName, TQObject *tqparent = 0, const char *name = 0);
+		PixmapCollection(const TQString &collectionName, TQObject *parent = 0, const char *name = 0);
 		~PixmapCollection() {;}
 
 		TQString addPixmapPath(const KURL &url);
@@ -80,7 +80,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionEditor : public KDialogBase
   TQ_OBJECT
 
 	public:
-		PixmapCollectionEditor(PixmapCollection *collection, TQWidget *tqparent = 0);
+		PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent = 0);
 		~PixmapCollectionEditor() {;}
 
 	protected:
@@ -109,7 +109,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionChooser : public KDialogBase
   TQ_OBJECT
 
 	public:
-		PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *tqparent = 0);
+		PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent = 0);
 		~PixmapCollectionChooser() {;}
 
 		TQPixmap  pixmap();
@@ -132,7 +132,7 @@ class KEXIEXTWIDGETS_EXPORT LoadIconDialog : public KDialogBase
   TQ_OBJECT
 
 	public:
-		LoadIconDialog(TQWidget *tqparent = 0);
+		LoadIconDialog(TQWidget *parent = 0);
 		~LoadIconDialog() {;}
 
 		int iconSize();
@@ -152,8 +152,8 @@ class KEXIEXTWIDGETS_EXPORT LoadIconDialog : public KDialogBase
 class KEXIEXTWIDGETS_EXPORT PixmapIconViewItem : public KIconViewItem
 {
 	public:
-		PixmapIconViewItem(KIconView *tqparent, const TQString &text, const TQPixmap &icon)
-		: KIconViewItem(tqparent, text, icon)  { m_name = text; }
+		PixmapIconViewItem(KIconView *parent, const TQString &text, const TQPixmap &icon)
+		: KIconViewItem(parent, text, icon)  { m_name = text; }
 		~PixmapIconViewItem() {;}
 
 		void setName(const TQString &name) { m_name = name; }
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index b1fc22d29..18c19ef93 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -45,8 +45,8 @@
 #include "kexirelationviewconnection.h"
 #include <kexi.h>
 
-KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name)
- : TQScrollView(tqparent, name, WStaticContents)
+KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
+ : TQScrollView(parent, name, WStaticContents)
 {
 //	m_relation=relation;
 //	m_relation->incUsageCount();
@@ -74,11 +74,11 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name)
 */	
 #if 0
 	m_removeSelectedTableQueryAction = new KAction(i18n("&Hide Selected Table/Query"), "editdelete", "",
-		this, TQT_SLOT(removeSelectedTableQuery()), tqparent->actionCollection(), "relationsview_removeSelectedTableQuery");
+		this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery");
 	m_removeSelectedConnectionAction = new KAction(i18n("&Remove Selected Relationship"), "button_cancel", "",
-		this, TQT_SLOT(removeSelectedConnection()), tqparent->actionCollection(), "relationsview_removeSelectedConnection");
+		this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection");
 	m_openSelectedTableQueryAction = new KAction(i18n("&Open Selected Table/Query"), "", "",
-		this, TQT_SLOT(openSelectedTableQuery()), 0/*tqparent->actionCollection()*/, "relationsview_openSelectedTableQuery");
+		this, TQT_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery");
 #endif
 
 //	invalidateActions();
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index dcf78834b..6bc31b31e 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -71,7 +71,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
   TQ_OBJECT
 
 	public:
-		KexiRelationView(TQWidget *tqparent, const char *name=0);
+		KexiRelationView(TQWidget *parent, const char *name=0);
 		virtual ~KexiRelationView();
 
 		//! \return a dictionary of added tables
diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp
index f294b49cc..c0635c1b7 100644
--- a/kexi/widget/relations/kexirelationviewconnection.cpp
+++ b/kexi/widget/relations/kexirelationviewconnection.cpp
@@ -40,9 +40,9 @@
 
 KexiRelationViewConnection::KexiRelationViewConnection(
 	KexiRelationViewTableContainer *masterTbl, KexiRelationViewTableContainer *detailsTbl, 
-	SourceConnection &c, KexiRelationView *tqparent)
+	SourceConnection &c, KexiRelationView *parent)
 {
-	m_parent = tqparent;
+	m_parent = parent;
 //	kdDebug() << "KexiRelationViewConnection::KexiRelationViewConnection()" << endl;
 
 	m_masterTable = masterTbl;
diff --git a/kexi/widget/relations/kexirelationviewconnection.h b/kexi/widget/relations/kexirelationviewconnection.h
index 7b5962101..745a5e23b 100644
--- a/kexi/widget/relations/kexirelationviewconnection.h
+++ b/kexi/widget/relations/kexirelationviewconnection.h
@@ -33,7 +33,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewConnection
 	public:
 
 		KexiRelationViewConnection(KexiRelationViewTableContainer *masterTbl, 
-			KexiRelationViewTableContainer *detailsTbl, struct SourceConnection &s, KexiRelationView *tqparent);
+			KexiRelationViewTableContainer *detailsTbl, struct SourceConnection &s, KexiRelationView *parent);
 		~KexiRelationViewConnection();
 
 
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index a45a9ad17..94a17f4db 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -43,10 +43,10 @@
 #include "kexirelationview.h"
 
 KexiRelationViewTableContainer::KexiRelationViewTableContainer(
-	KexiRelationView *tqparent, KexiDB::TableOrQuerySchema *schema)
- : TQFrame(tqparent,"KexiRelationViewTableContainer" )
+	KexiRelationView *parent, KexiDB::TableOrQuerySchema *schema)
+ : TQFrame(parent,"KexiRelationViewTableContainer" )
 // , m_table(t)
- , m_parent(tqparent)
+ , m_parent(parent)
 //	, m_mousePressed(false)
 {
 
@@ -66,7 +66,7 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 	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, tqparent, this, "KexiRelationViewTable");
+	m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable");
 	//m_tableHeader->setFocusProxy( m_tableView );
 	m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 	
@@ -176,8 +176,8 @@ void KexiRelationViewTableContainer::unsetFocus()
 //BEGIN KexiRelatoinViewTableContainerHeader
 
 KexiRelationViewTableContainerHeader::KexiRelationViewTableContainerHeader(
-	const TQString& text,TQWidget *tqparent)
-	:TQLabel(text,tqparent),m_dragging(false) 
+	const TQString& text,TQWidget *parent)
+	:TQLabel(text,parent),m_dragging(false) 
 {
 	setMargin(1);
 	m_activeBG = KGlobalSettings::activeTitleColor();
@@ -292,8 +292,8 @@ void KexiRelationViewTableContainerHeader::mouseReleaseEvent(TQMouseEvent *ev) {
 //=====================================================================================
 
 KexiRelationViewTable::KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOrQuerySchema, 
-	KexiRelationView *view, TQWidget *tqparent, const char *name)
- : KexiFieldListView(tqparent, name, KexiFieldListView::ShowAsterisk)
+	KexiRelationView *view, TQWidget *parent, const char *name)
+ : KexiFieldListView(parent, name, KexiFieldListView::ShowAsterisk)
  , m_view(view)
 {
 	setSchema(tableOrQuerySchema);
diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h
index deabc2e01..5c622dad1 100644
--- a/kexi/widget/relations/kexirelationviewtable.h
+++ b/kexi/widget/relations/kexirelationviewtable.h
@@ -43,9 +43,9 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame
   TQ_OBJECT
 
 	public:
-//		KexiRelationViewTableContainer(KexiRelationView *tqparent, KexiDB::TableSchema *t);
+//		KexiRelationViewTableContainer(KexiRelationView *parent, KexiDB::TableSchema *t);
 		KexiRelationViewTableContainer(
-			KexiRelationView *tqparent, KexiDB::TableOrQuerySchema *schema);
+			KexiRelationView *parent, KexiDB::TableOrQuerySchema *schema);
 
 		virtual ~KexiRelationViewTableContainer();
 
@@ -85,7 +85,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame
 class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableItem : public KListViewItem
 {
 	public:
-		KexiRelationViewTableItem(TQListView *tqparent, TQListViewItem *after,
+		KexiRelationViewTableItem(TQListView *parent, TQListViewItem *after,
 			TQString key, TQString field);
 		virtual void paintFocus ( TQPainter * p, const TQColorGroup & cg, const TQRect & r );
 };*/
@@ -98,8 +98,8 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView
 
 	public:
 		KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOrQuerySchema, 
-			KexiRelationView *view, TQWidget *tqparent, const char *name = 0);
-//		KexiRelationViewTable(TQWidget *tqparent, KexiRelationView *view, KexiDB::TableSchema *t, const char *name=0);
+			KexiRelationView *view, TQWidget *parent, const char *name = 0);
+//		KexiRelationViewTable(TQWidget *parent, KexiRelationView *view, KexiDB::TableSchema *t, const char *name=0);
 		virtual ~KexiRelationViewTable();
 
 //		KexiDB::TableSchema *table() const { return m_table; };
@@ -133,7 +133,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainerHeader : public TQL
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiRelationViewTableContainerHeader(const TQString& text,TQWidget *tqparent);
+		KexiRelationViewTableContainerHeader(const TQString& text,TQWidget *parent);
 		virtual ~KexiRelationViewTableContainerHeader();
 
 		virtual void setFocus();
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index ee9caeed1..4b9521637 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -41,9 +41,9 @@
 #include "kexirelationviewtable.h"
 #include "kexirelationviewconnection.h"
 
-KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, 
+KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, 
 	const char *name)
-	: KexiViewBase(win, tqparent, name)
+	: KexiViewBase(win, parent, name)
 	, m_win(win)
 {
 	m_conn = m_win->project()->dbConnection();
@@ -118,7 +118,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent,
 	if(!embedd)
 	{
 /*todo		setContextHelp(i18n("Relations"), i18n("To create a relationship simply drag the source field onto the target field. "
-			"An arrowhead is used to show which table is the tqparent (master) and which table is the child (slave) in the relationship."));*/
+			"An arrowhead is used to show which table is the parent (master) and which table is the child (slave) in the relationship."));*/
 	}
 #endif
 //	else
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 20a701746..39ac549a9 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -47,7 +47,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
   TQ_OBJECT
 
 	public:
-		KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, const char *name=0);
+		KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, const char *name=0);
 		virtual ~KexiRelationWidget();
 
 		//! \return a dictionary of added tables
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index dbf95ad67..7ad76c341 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -80,8 +80,8 @@ public:
 
 //======================================================
 
-KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiTableEdit(column, tqparent)
+KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiTableEdit(column, parent)
  , d ( new Private() )
 {
 	setName("KexiBlobTableEdit");
@@ -490,8 +490,8 @@ public:
 	TQCache<TQPixmap> pixmapCache;
 };
 
-KexiKIconTableEdit::KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiTableEdit(column, tqparent)
+KexiKIconTableEdit::KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiTableEdit(column, parent)
  , d( new Private() )
 {
 	setName("KexiKIconTableEdit");
diff --git a/kexi/widget/tableview/kexiblobtableedit.h b/kexi/widget/tableview/kexiblobtableedit.h
index fb64c21d0..77a211d23 100644
--- a/kexi/widget/tableview/kexiblobtableedit.h
+++ b/kexi/widget/tableview/kexiblobtableedit.h
@@ -38,7 +38,7 @@ class KexiBlobTableEdit : public KexiTableEdit
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 		virtual ~KexiBlobTableEdit();
 
 		bool valueIsNull();
@@ -129,7 +129,7 @@ KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiBlobEditorFactoryItem)
 class KexiKIconTableEdit : public KexiTableEdit
 {
 	public:
-		KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 
 		virtual ~KexiKIconTableEdit();
 
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index a9220ea81..8f199b5d1 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -31,8 +31,8 @@
 #include <kglobalsettings.h>
 
 
-KexiBoolTableEdit::KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiTableEdit(column, tqparent)
+KexiBoolTableEdit::KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiTableEdit(column, parent)
 {
 	setName("KexiBoolTableEdit");
 	kdDebug() << "KexiBoolTableEdit: m_origValue.typeName()==" << m_origValue.typeName() << endl;
diff --git a/kexi/widget/tableview/kexibooltableedit.h b/kexi/widget/tableview/kexibooltableedit.h
index 3fc87d587..4f4ebad5b 100644
--- a/kexi/widget/tableview/kexibooltableedit.h
+++ b/kexi/widget/tableview/kexibooltableedit.h
@@ -33,7 +33,7 @@ class KexiBoolTableEdit : public KexiTableEdit
   TQ_OBJECT
 
 	public:
-		KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 
 		virtual ~KexiBoolTableEdit();
 
diff --git a/kexi/widget/tableview/kexicelleditorfactory.cpp b/kexi/widget/tableview/kexicelleditorfactory.cpp
index a2c79a88e..9cfcfe273 100644
--- a/kexi/widget/tableview/kexicelleditorfactory.cpp
+++ b/kexi/widget/tableview/kexicelleditorfactory.cpp
@@ -146,7 +146,7 @@ static bool hasEnumType( const KexiTableViewColumn &column )
 	return true;
 }
 
-KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column, TQWidget* tqparent)
+KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column, TQWidget* parent)
 {
 	init();
 	KexiDB::Field *realField;
@@ -187,7 +187,7 @@ KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column,
 	}
 #endif
 
-	return item->createEditor(column, tqparent);
+	return item->createEditor(column, parent);
 }
 
 KexiCellEditorFactoryItem* KexiCellEditorFactory::item( uint type, const TQString& subType )
diff --git a/kexi/widget/tableview/kexicelleditorfactory.h b/kexi/widget/tableview/kexicelleditorfactory.h
index 26b48bb65..06795ac01 100644
--- a/kexi/widget/tableview/kexicelleditorfactory.h
+++ b/kexi/widget/tableview/kexicelleditorfactory.h
@@ -51,10 +51,10 @@ class KEXIDATATABLE_EXPORT KexiCellEditorFactory
 		 If still no item found, the default is tried. Eventually, may return NULL. */
 		static KexiCellEditorFactoryItem* item( uint type, const TQString& subType = TQString() );
 
-//		static KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* tqparent = 0);
-		/*! Creates a new editor for \a column. If \a tqparent is of TQScrollView, the new editor
-		 will be created inside tqparent->viewport() instead. */
-		static KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* tqparent = 0);
+//		static KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* parent = 0);
+		/*! Creates a new editor for \a column. If \a parent is of TQScrollView, the new editor
+		 will be created inside parent->viewport() instead. */
+		static KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* parent = 0);
 
 	protected:
 		static void init();
@@ -69,8 +69,8 @@ class KEXIDATATABLE_EXPORT KexiCellEditorFactoryItem
 		TQString className() { return m_className; }
 
 	protected:
-//		virtual KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* tqparent = 0) = 0;
-		virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* tqparent = 0) = 0;
+//		virtual KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* parent = 0) = 0;
+		virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* parent = 0) = 0;
 
 		TQString m_className;
 	friend class KexiCellEditorFactory;
diff --git a/kexi/widget/tableview/kexicomboboxbase.h b/kexi/widget/tableview/kexicomboboxbase.h
index f36dd822c..17b120726 100644
--- a/kexi/widget/tableview/kexicomboboxbase.h
+++ b/kexi/widget/tableview/kexicomboboxbase.h
@@ -122,7 +122,7 @@ class KEXIDATATABLE_EXPORT KexiComboBoxBase
 		//! Implement this as signal
 		virtual void acceptRequested() = 0;
 
-		//! Implement this to return a position \a pos mapped from tqparent (e.g. viewport) 
+		//! Implement this to return a position \a pos mapped from parent (e.g. viewport) 
 		//! to global coordinates. TQPoint(-1, -1) should be returned if this cannot be computed.
 		virtual TQPoint mapFromParentToGlobal(const TQPoint& pos) const = 0;
 
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 4fe8b9403..6a2feec87 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -38,8 +38,8 @@
 class KexiComboBoxPopup_KexiTableView : public KexiDataTableView
 {
 	public:
-		KexiComboBoxPopup_KexiTableView(TQWidget* tqparent=0)
-		 : KexiDataTableView(tqparent, "KexiComboBoxPopup_tv")
+		KexiComboBoxPopup_KexiTableView(TQWidget* parent=0)
+		 : KexiDataTableView(parent, "KexiComboBoxPopup_tv")
 		{
 			init();
 		}
@@ -103,16 +103,16 @@ class KexiComboBoxPopupPrivate
 
 const int KexiComboBoxPopup::defaultMaxRows = 8;
 
-KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* tqparent, KexiTableViewColumn &column)
- : TQFrame( tqparent, "KexiComboBoxPopup", WType_Popup )
+KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* parent, KexiTableViewColumn &column)
+ : TQFrame( parent, "KexiComboBoxPopup", WType_Popup )
 {
 	init();
 	//setup tv data
 	setData(&column, 0);
 }
 
-KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* tqparent, KexiDB::Field &field)
- : TQFrame( tqparent, "KexiComboBoxPopup", WType_Popup )
+KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* parent, KexiDB::Field &field)
+ : TQFrame( parent, "KexiComboBoxPopup", WType_Popup )
 {
 	init();
 	//setup tv data
diff --git a/kexi/widget/tableview/kexicomboboxpopup.h b/kexi/widget/tableview/kexicomboboxpopup.h
index d78955b2b..876be9bce 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.h
+++ b/kexi/widget/tableview/kexicomboboxpopup.h
@@ -42,10 +42,10 @@ class KexiComboBoxPopup : public TQFrame
 		 If the column is lookup column, it's definition is used to display
 		 one or more column within the popup. Otherwise column.field() is used
 		 to display single-column data. */
-		KexiComboBoxPopup(TQWidget* tqparent, KexiTableViewColumn &column);
+		KexiComboBoxPopup(TQWidget* parent, KexiTableViewColumn &column);
 
 		/*! Alternative constructor supporting lookup fields and enum hints. */
-		KexiComboBoxPopup(TQWidget* tqparent, KexiDB::Field &field);
+		KexiComboBoxPopup(TQWidget* parent, KexiDB::Field &field);
 
 		virtual ~KexiComboBoxPopup();
 
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 8b803746d..3ae979744 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -61,8 +61,8 @@ public:
 
 //======================================================
 
-KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiInputTableEdit(column, tqparent)
+KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiInputTableEdit(column, parent)
  , KexiComboBoxBase()
  , d(new Private())
 {
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.h b/kexi/widget/tableview/kexicomboboxtableedit.h
index 7b8a7339e..55d128c3d 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.h
+++ b/kexi/widget/tableview/kexicomboboxtableedit.h
@@ -40,7 +40,7 @@ class KexiComboBoxTableEdit : public KexiInputTableEdit, public KexiComboBoxBase
   TQ_OBJECT
 
 	public:
-		KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 		virtual ~KexiComboBoxTableEdit();
 
 		//! Implemented for KexiComboBoxBase
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 5668fbfd6..257cf0aae 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -111,8 +111,8 @@ void KexiDataAwarePropertySet::insert(uint row, KoProperty::Set* set, bool newOn
 		kexiwarn << "KexiDataAwarePropertySet::insert() invalid args: rew="<< row<< " propertyset="<< set<< endl;
 		return;
 	}
-	if (set->tqparent() && set->tqparent()!=this) {
-		kexiwarn << "KexiDataAwarePropertySet::insert() propertyset's tqparent must be NULL or this KexiDataAwarePropertySet" << endl;
+	if (set->parent() && set->parent()!=this) {
+		kexiwarn << "KexiDataAwarePropertySet::insert() propertyset's parent must be NULL or this KexiDataAwarePropertySet" << endl;
 		return;
 	}
 
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h
index 8d6212c40..e24fbd8a8 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.h
+++ b/kexi/widget/tableview/kexidataawarepropertyset.h
@@ -107,7 +107,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject
 		 The property set \a set will be owned by this object, so you should not
 		 delete this property set by hand but call removeCurrentPropertySet()
 		 or remove(uint) instead.
-		 Note that property set's tqparent (TQObject::tqparent()) must be null
+		 Note that property set's parent (TQObject::parent()) must be null
 		 or qual to this KexiDataAwarePropertySet object, otherwise this method
 		 will fail with a warning.
 		*/
diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp
index 7d7dbde67..a132e829d 100644
--- a/kexi/widget/tableview/kexidatatableview.cpp
+++ b/kexi/widget/tableview/kexidatatableview.cpp
@@ -33,14 +33,14 @@
 #include "kexidatatableview.h"
 
 
-KexiDataTableView::KexiDataTableView(TQWidget *tqparent, const char *name)
- : KexiTableView(0, tqparent, name)
+KexiDataTableView::KexiDataTableView(TQWidget *parent, const char *name)
+ : KexiTableView(0, parent, name)
 {
 	init();
 }
 
-KexiDataTableView::KexiDataTableView(TQWidget *tqparent, const char *name, KexiDB::Cursor *cursor)
- : KexiTableView(0, tqparent, name)
+KexiDataTableView::KexiDataTableView(TQWidget *parent, const char *name, KexiDB::Cursor *cursor)
+ : KexiTableView(0, parent, name)
 {
 	init();
 	setData(cursor);
diff --git a/kexi/widget/tableview/kexidatatableview.h b/kexi/widget/tableview/kexidatatableview.h
index 7835289fa..000762f21 100644
--- a/kexi/widget/tableview/kexidatatableview.h
+++ b/kexi/widget/tableview/kexidatatableview.h
@@ -44,7 +44,7 @@ class KEXIDATATABLE_EXPORT KexiDataTableView : public KexiTableView
 		/**
 		 * creates a blank widget
 		 */
-		KexiDataTableView(TQWidget *tqparent, const char *name =0);
+		KexiDataTableView(TQWidget *parent, const char *name =0);
 
 		/*! Creates a table widget and fills it using data from \a cursor.
 		 Cursor will be opened (with open()) if it is not yet opened.
@@ -52,7 +52,7 @@ class KEXIDATATABLE_EXPORT KexiDataTableView : public KexiTableView
 		 and Connection::executeQuery()), otherwise the table view remain not filled with data.
 		 Cursor \a cursor will not be owned by this object.
 		 */
-		KexiDataTableView(TQWidget *tqparent, const char *name, KexiDB::Cursor *cursor);
+		KexiDataTableView(TQWidget *parent, const char *name, KexiDB::Cursor *cursor);
 
 		~KexiDataTableView();
 
diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp
index a0b5185e3..b68b47879 100644
--- a/kexi/widget/tableview/kexidatetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetableedit.cpp
@@ -48,8 +48,8 @@
 #include <kexiutils/utils.h>
 
 
-KexiDateTableEdit::KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiInputTableEdit(column, tqparent)
+KexiDateTableEdit::KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiInputTableEdit(column, parent)
 {
 	setName("KexiDateTableEdit");
 
@@ -225,7 +225,7 @@ bool KexiDateTableEdit::eventFilter( TQObject *o, TQEvent *e )
 		}
 	}
 #ifdef TQ_WS_WIN //tmp
-	else if (e->type()==TQEvent::FocusIn && o->tqparent() && o->tqparent()->tqparent()==m_edit
+	else if (e->type()==TQEvent::FocusIn && o->parent() && o->parent()->parent()==m_edit
 		&& m_setNumberOnFocus >= 0 && m_dte_date_obj)
 	{
 		// there was a number character passed as 'add' parameter in init():
diff --git a/kexi/widget/tableview/kexidatetableedit.h b/kexi/widget/tableview/kexidatetableedit.h
index aad46c4b7..2346dfd16 100644
--- a/kexi/widget/tableview/kexidatetableedit.h
+++ b/kexi/widget/tableview/kexidatetableedit.h
@@ -37,7 +37,7 @@ class KexiDateTableEdit : public KexiInputTableEdit
   TQ_OBJECT
 
 	public:
-		KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 		virtual ~KexiDateTableEdit();
 		virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, 
 			TQString &txt, int &align, int &x, int &y_offset, int &w, int &h );
diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp
index 46f687f05..35c599cc3 100644
--- a/kexi/widget/tableview/kexidatetimetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetimetableedit.cpp
@@ -47,8 +47,8 @@
 
 #include <kexiutils/utils.h>
 
-KexiDateTimeTableEdit::KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiInputTableEdit(column, tqparent)
+KexiDateTimeTableEdit::KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiInputTableEdit(column, parent)
 {
 	setName("KexiDateTimeTableEdit");
 
diff --git a/kexi/widget/tableview/kexidatetimetableedit.h b/kexi/widget/tableview/kexidatetimetableedit.h
index 6fb88a670..0e12fa849 100644
--- a/kexi/widget/tableview/kexidatetimetableedit.h
+++ b/kexi/widget/tableview/kexidatetimetableedit.h
@@ -37,7 +37,7 @@ class KexiDateTimeTableEdit : public KexiInputTableEdit
   TQ_OBJECT
 
 	public:
-		KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 		virtual ~KexiDateTimeTableEdit();
 		virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, 
 			TQString &txt, int &align, int &x, int &y_offset, int &w, int &h );
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index 575ae1e65..1b834fe90 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -43,7 +43,7 @@
 class MyLineEdit : public KLineEdit
 {
 	public:
-		MyLineEdit(TQWidget *tqparent, const char *name) : KLineEdit(tqparent,name)
+		MyLineEdit(TQWidget *parent, const char *name) : KLineEdit(parent,name)
 		{}
 	protected:
 		virtual void drawFrame ( TQPainter * p ) {
@@ -60,8 +60,8 @@ class MyLineEdit : public KLineEdit
 
 //======================================================
 
-KexiInputTableEdit::KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiTableEdit(column, tqparent)
+KexiInputTableEdit::KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiTableEdit(column, parent)
 {
 	setName("KexiInputTableEdit");
 //	m_type = f.type(); //copied because the rest of code uses m_type
diff --git a/kexi/widget/tableview/kexiinputtableedit.h b/kexi/widget/tableview/kexiinputtableedit.h
index 3b4cf0155..89e642649 100644
--- a/kexi/widget/tableview/kexiinputtableedit.h
+++ b/kexi/widget/tableview/kexiinputtableedit.h
@@ -36,7 +36,7 @@ class KEXIDATATABLE_EXPORT KexiInputTableEdit : public KexiTableEdit
   TQ_OBJECT
 
 	public:
-		KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 
 		virtual ~KexiInputTableEdit();
 
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index fd4870fbd..e531b814a 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -30,12 +30,12 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, TQWidget* tqparent)
-: TQWidget(dynamic_cast<TQScrollView*>(tqparent) ? dynamic_cast<TQScrollView*>(tqparent)->viewport() : tqparent)
+KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, TQWidget* parent)
+: TQWidget(dynamic_cast<TQScrollView*>(parent) ? dynamic_cast<TQScrollView*>(parent)->viewport() : parent)
  ,m_column(&column)
 // ,m_field(&f)
 // ,m_type(f.type()) //copied because the rest of code uses m_type
- ,m_scrollView(dynamic_cast<TQScrollView*>(tqparent))
+ ,m_scrollView(dynamic_cast<TQScrollView*>(parent))
  ,m_usesSelectedTextColor(true)
  ,m_view(0)
 // ,m_hasFocusableWidget(true)
diff --git a/kexi/widget/tableview/kexitableedit.h b/kexi/widget/tableview/kexitableedit.h
index ef618178f..4630757cc 100644
--- a/kexi/widget/tableview/kexitableedit.h
+++ b/kexi/widget/tableview/kexitableedit.h
@@ -42,7 +42,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI
   TQ_OBJECT
 
 	public:
-		KexiTableEdit(KexiTableViewColumn &column, TQWidget* tqparent = 0);
+		KexiTableEdit(KexiTableViewColumn &column, TQWidget* parent = 0);
 
 		virtual ~KexiTableEdit();
 
@@ -184,7 +184,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI
 		 for the editor, its events will be filtered, it will be resized when neede, and so on. */
 		void setViewWidget(TQWidget *v);
 
-		/*! Moves child widget within the viewport if the tqparent is scrollview (otherwise does nothing). 
+		/*! Moves child widget within the viewport if the parent is scrollview (otherwise does nothing). 
 		 Use this for child widgets that are outside of this editor widget, instead of calling TQWidget::move(). */
 		void moveChild( TQWidget * child, int x, int y );
 
@@ -195,7 +195,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI
 		KexiTableViewColumn *m_column;
 		int m_leftMargin;
 		int m_rightMargin, m_rightMarginWhenFocused;
-		TQScrollView* m_scrollView; //!< may be 0 if the tqparent is not a scrollview
+		TQScrollView* m_scrollView; //!< may be 0 if the parent is not a scrollview
 		bool m_usesSelectedTextColor : 1; //!< set in ctor, @see usesSelectedTextColor()
 
 	private:
@@ -211,7 +211,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI
 			virtual ~factoryclassname(); \
 	\
 		protected: \
-			virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* tqparent = 0); \
+			virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* parent = 0); \
 	};
 
 //! Implementation of cell editor factory
@@ -226,9 +226,9 @@ factoryclassname::~factoryclassname() \
 {} \
 \
 KexiTableEdit* factoryclassname::createEditor( \
-	KexiTableViewColumn &column, TQWidget* tqparent) \
+	KexiTableViewColumn &column, TQWidget* parent) \
 { \
-	return new itemclassname(column, tqparent); \
+	return new itemclassname(column, parent); \
 }
 
 #endif
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index d164f68ac..4ed993cda 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -174,8 +174,8 @@ void KexiTableViewCellToolTip::maybeTip( const TQPoint & p )
 
 //-----------------------------------------
 
-KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* tqparent, const char* name)
-: TQScrollView(tqparent, name, /*TQt::WRepaintNoErase | */TQt::WStaticContents /*| TQt::WResizeNoErase*/)
+KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const char* name)
+: TQScrollView(parent, name, /*TQt::WRepaintNoErase | */TQt::WStaticContents /*| TQt::WResizeNoErase*/)
 , KexiRecordNavigatorHandler()
 , KexiSharedActionClient()
 , KexiDataAwareObjectInterface()
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index 6c03215bd..9cfcf47e0 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -149,7 +149,7 @@ public:
 		TQColor rowMouseOverAlternateHighlightingColor;
 	};
 	
-	KexiTableView(KexiTableViewData* data=0, TQWidget* tqparent=0, const char* name=0);
+	KexiTableView(KexiTableViewData* data=0, TQWidget* parent=0, const char* name=0);
 	virtual ~KexiTableView();
 
 	/*! \return current appearance settings */
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index 1fb65c6a3..5905706b1 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -122,7 +122,7 @@ KexiTableViewColumn::KexiTableViewColumn(
 	}
 	init();
 	//setup column's readonly flag: true, if
-	// - it's not from tqparent table's field, or
+	// - it's not from parent table's field, or
 	// - if the query itself is coming from read-only connection, or
 	// - if the query itself is stored (i.e. has connection) and lookup column is defined
 	const bool columnFromMasterTable = query.masterTable()==columnInfo->field->table();
@@ -168,7 +168,7 @@ void KexiTableViewColumn::init()
 void KexiTableViewColumn::setValidator( KexiUtils::Validator* v )
 {
 	if (m_validator) {//remove old one
-		if (!m_validator->tqparent()) //destroy if has no tqparent
+		if (!m_validator->parent()) //destroy if has no parent
 			delete m_validator;
 	}
 	m_validator = v;
diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h
index dec81f955..7263f3fee 100644
--- a/kexi/widget/tableview/kexitableviewdata.h
+++ b/kexi/widget/tableview/kexitableviewdata.h
@@ -85,7 +85,7 @@ class KEXIDATATABLE_EXPORT KexiTableViewColumn {
 
 		/*! \return true if the column is read-only
 		 For db-aware column this can depend on whether the column 
-		 is in tqparent table of this query. \sa setReadOnly() */
+		 is in parent table of this query. \sa setReadOnly() */
 		bool isReadOnly() const;
 
 //TODO: synchronize this with table view:
@@ -123,7 +123,7 @@ class KEXIDATATABLE_EXPORT KexiTableViewColumn {
 		inline TQString captionAliasOrName() const { return m_captionAliasOrName; }
 
 		/*! Assigns validator \a v for this column. 
-		 If the validator has no tqparent object, it will be owned by the column, 
+		 If the validator has no parent object, it will be owned by the column, 
 		 so you shouldn't care about destroying it. */
 		void setValidator( KexiUtils::Validator* v );
 
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index f6a839e3f..4a00be38c 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -58,8 +58,8 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 		TQColor m_backgroundColor;
 };
 
-KexiTableViewHeader::KexiTableViewHeader(TQWidget * tqparent, const char * name) 
-	: TQHeader(tqparent, name)
+KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name) 
+	: TQHeader(parent, name)
 	, m_lastToolTipSection(-1)
 	, m_selectionBackgroundColor(tqApp->tqpalette().active().highlight())
 	, m_selectedSection(-1)
diff --git a/kexi/widget/tableview/kexitableviewheader.h b/kexi/widget/tableview/kexitableviewheader.h
index efc350558..eae13a71f 100644
--- a/kexi/widget/tableview/kexitableviewheader.h
+++ b/kexi/widget/tableview/kexitableviewheader.h
@@ -36,7 +36,7 @@ class KEXIDATATABLE_EXPORT KexiTableViewHeader : public TQHeader
   TQ_OBJECT
 
 	public:
-		KexiTableViewHeader(TQWidget * tqparent = 0, const char * name = 0);
+		KexiTableViewHeader(TQWidget * parent = 0, const char * name = 0);
 
 		virtual ~KexiTableViewHeader();
 
diff --git a/kexi/widget/tableview/kexitextformatter.h b/kexi/widget/tableview/kexitextformatter.h
index 12e67a37e..9ec87656b 100644
--- a/kexi/widget/tableview/kexitextformatter.h
+++ b/kexi/widget/tableview/kexitextformatter.h
@@ -53,7 +53,7 @@ class KEXIDATATABLE_EXPORT KexiTextFormatter
 		 A field schema set using setField() is used to perform the calculation. */
 		bool valueIsValid(const TQString& text) const;
 
-		/*! \return input tqmask for intering values related to a field schema 
+		/*! \return input mask for intering values related to a field schema 
 		 which has been set using setField(). */
 		TQString inputMask() const;
 
diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp
index 5f3313f75..8110716b5 100644
--- a/kexi/widget/tableview/kexitimetableedit.cpp
+++ b/kexi/widget/tableview/kexitimetableedit.cpp
@@ -45,8 +45,8 @@
 
 #include <kexiutils/utils.h>
 
-KexiTimeTableEdit::KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent)
- : KexiInputTableEdit(column, tqparent)
+KexiTimeTableEdit::KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+ : KexiInputTableEdit(column, parent)
 {
 	setName("KexiTimeTableEdit");
 
diff --git a/kexi/widget/tableview/kexitimetableedit.h b/kexi/widget/tableview/kexitimetableedit.h
index 6c427bbd5..0231a9bf9 100644
--- a/kexi/widget/tableview/kexitimetableedit.h
+++ b/kexi/widget/tableview/kexitimetableedit.h
@@ -35,7 +35,7 @@ class KexiTimeTableEdit : public KexiInputTableEdit
   TQ_OBJECT
 
 	public:
-		KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
+		KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 		virtual ~KexiTimeTableEdit();
 		virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, 
 			TQString &txt, int &align, int &x, int &y_offset, int &w, int &h );
diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index 2c6f86aad..fa5c35abd 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -30,8 +30,8 @@
 
 #include <kexiutils/utils.h>
 
-KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* tqparent)
- : KexiToolTip(text, tqparent)
+KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* parent)
+ : KexiToolTip(text, parent)
  , m_opacity(0.0)
 {
 	TQPalette pal( palette() );
@@ -49,7 +49,7 @@ KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* tqparent)
 
 	setAutoMask( false );
 
-	//generate tqmask
+	//generate mask
 	TQPixmap maskPm(size());
 	maskPm.fill( black );
 	TQPainter maskPainter(&maskPm);
diff --git a/kexi/widget/utils/kexiarrowtip.h b/kexi/widget/utils/kexiarrowtip.h
index 791535fa8..f4d87d41c 100644
--- a/kexi/widget/utils/kexiarrowtip.h
+++ b/kexi/widget/utils/kexiarrowtip.h
@@ -31,7 +31,7 @@ class KEXIGUIUTILS_EXPORT KexiArrowTip : public KexiToolTip
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiArrowTip(const TQString& text, TQWidget* tqparent);
+		KexiArrowTip(const TQString& text, TQWidget* parent);
 		virtual ~KexiArrowTip();
 
 		inline TQString text() const { return m_value.toString(); }
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index b5c22372f..777fea1bf 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -26,8 +26,8 @@
 #include <tqstyle.h>
 #include <tqapplication.h>
 
-KexiComboBoxDropDownButton::KexiComboBoxDropDownButton( TQWidget *tqparent )
- : KPushButton(tqparent)
+KexiComboBoxDropDownButton::KexiComboBoxDropDownButton( TQWidget *parent )
+ : KPushButton(parent)
 {
 	m_paintedCombo = new KComboBox(this);
 	m_paintedCombo->hide();
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.h b/kexi/widget/utils/kexicomboboxdropdownbutton.h
index 970e46c3e..f480de742 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.h
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.h
@@ -30,7 +30,7 @@ class KComboBox;
 class KEXIGUIUTILS_EXPORT KexiComboBoxDropDownButton : public KPushButton
 {
 	public:
-		KexiComboBoxDropDownButton( TQWidget *tqparent );
+		KexiComboBoxDropDownButton( TQWidget *parent );
 		virtual ~KexiComboBoxDropDownButton();
 
 	protected:
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index f882f6fa0..3c6b22f06 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -39,8 +39,8 @@
 class KexiImageContextMenu::Private
 {
 public:
-	Private(TQWidget *tqparent)
-	 : actionCollection(tqparent)
+	Private(TQWidget *parent)
+	 : actionCollection(parent)
 	{
 	}
 
@@ -55,8 +55,8 @@ public:
 
 //------------
 
-KexiImageContextMenu::KexiImageContextMenu(TQWidget* tqparent)
- : KPopupMenu(tqparent)
+KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent)
+ : KPopupMenu(parent)
  , d( new Private(this) )
 {
 	setName("KexiImageContextMenu");
diff --git a/kexi/widget/utils/kexicontextmenuutils.h b/kexi/widget/utils/kexicontextmenuutils.h
index 2f73b18e7..50bb96a01 100644
--- a/kexi/widget/utils/kexicontextmenuutils.h
+++ b/kexi/widget/utils/kexicontextmenuutils.h
@@ -53,7 +53,7 @@ class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu
   TQ_OBJECT
 
 	public:
-		KexiImageContextMenu(TQWidget *tqparent);
+		KexiImageContextMenu(TQWidget *parent);
 		virtual ~KexiImageContextMenu();
 
 		KActionCollection* actionCollection() const;
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index 1e7b9bc9d..8f4d0b96b 100644
--- a/kexi/widget/utils/kexidatetimeformatter.cpp
+++ b/kexi/widget/utils/kexidatetimeformatter.cpp
@@ -317,9 +317,9 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const
 
 TQString dateTimeInputMask(const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter)
 {
-	TQString tqmask(dateFormatter.inputMask());
-	tqmask.truncate(dateFormatter.inputMask().length()-2);
-	return tqmask + " " + timeFormatter.inputMask();
+	TQString mask(dateFormatter.inputMask());
+	mask.truncate(dateFormatter.inputMask().length()-2);
+	return mask + " " + timeFormatter.inputMask();
 }
 
 TQDateTime stringToDateTime(
diff --git a/kexi/widget/utils/kexidatetimeformatter.h b/kexi/widget/utils/kexidatetimeformatter.h
index 1340320b3..f011a0e23 100644
--- a/kexi/widget/utils/kexidatetimeformatter.h
+++ b/kexi/widget/utils/kexidatetimeformatter.h
@@ -50,7 +50,7 @@ class KEXIGUIUTILS_EXPORT KexiDateFormatter
 		//! \return null string if \a date is invalid
 		TQString dateToString( const TQDate& date ) const;
 
-		//! \return Input tqmask generated using the formatter settings. 
+		//! \return Input mask generated using the formatter settings. 
 		//! Can be used in TQLineEdit::setInputMask().
 		TQString inputMask() const { return m_inputMask; }
 
@@ -62,7 +62,7 @@ class KEXIGUIUTILS_EXPORT KexiDateFormatter
 		bool isEmpty( const TQString& str ) const;
 
 	protected:
-		//! Input tqmask generated using the formatter settings. Can be used in TQLineEdit::setInputMask().
+		//! Input mask generated using the formatter settings. Can be used in TQLineEdit::setInputMask().
 		TQString m_inputMask;
 
 		//! Order of date sections
@@ -111,7 +111,7 @@ class KEXIGUIUTILS_EXPORT KexiTimeFormatter
 		//! \return null string if \a time is invalid
 		TQString timeToString( const TQTime& time ) const;
 
-		//! \return Input tqmask generated using the formatter settings. 
+		//! \return Input mask generated using the formatter settings. 
 		//! Can be used in TQLineEdit::setInputMask().
 		TQString inputMask() const { return m_inputMask; }
 
@@ -120,7 +120,7 @@ class KEXIGUIUTILS_EXPORT KexiTimeFormatter
 		bool isEmpty( const TQString& str ) const;
 
 	protected:
-		//! Input tqmask generated using the formatter settings. Can be used in TQLineEdit::setInputMask().
+		//! Input mask generated using the formatter settings. Can be used in TQLineEdit::setInputMask().
 		TQString m_inputMask;
 
 //		//! Order of date sections
@@ -140,7 +140,7 @@ class KEXIGUIUTILS_EXPORT KexiTimeFormatter
 		TQRegExp *m_hmsRegExp, *m_hmRegExp;
 };
 
-//! \return a date/time input tqmask using date and time formatter. 
+//! \return a date/time input mask using date and time formatter. 
 //! Date is separated from time by one space character.
 KEXIGUIUTILS_EXPORT TQString dateTimeInputMask(
 	const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter);
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index b2ed022e3..909d507ca 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -25,8 +25,8 @@
 #include <tqstyle.h>
 #include <tqapplication.h>
 
-KexiDropDownButton::KexiDropDownButton(TQWidget *tqparent)
- : TQToolButton(tqparent, "KexiDBImageBox::Button")
+KexiDropDownButton::KexiDropDownButton(TQWidget *parent)
+ : TQToolButton(parent, "KexiDBImageBox::Button")
 {
 	tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
 //! @todo get this from a KStyle
diff --git a/kexi/widget/utils/kexidropdownbutton.h b/kexi/widget/utils/kexidropdownbutton.h
index a2d280a73..e61ab9f5c 100644
--- a/kexi/widget/utils/kexidropdownbutton.h
+++ b/kexi/widget/utils/kexidropdownbutton.h
@@ -33,7 +33,7 @@ class KEXIGUIUTILS_EXPORT KexiDropDownButton : public TQToolButton
   TQ_OBJECT
 
 	public:
-		KexiDropDownButton(TQWidget *tqparent);
+		KexiDropDownButton(TQWidget *parent);
 		virtual ~KexiDropDownButton();
 
 		virtual void drawButton( TQPainter *p );
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index c7c7687cd..dc655c63f 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -66,16 +66,16 @@ KexiFlowLayoutIterator::takeCurrent()
 
 //// The tqlayout itself
 
-KexiFlowLayout::KexiFlowLayout(TQWidget *tqparent, int border, int space, const char *name)
- : TQLayout(tqparent, border, space, name)
+KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name)
+ : TQLayout(parent, border, space, name)
 {
 	m_orientation =Qt::Horizontal;
 	m_justify = false;
 	m_cached_width = 0;
 }
 
-KexiFlowLayout::KexiFlowLayout(TQLayout* tqparent, int space, const char *name)
- : TQLayout( tqparent, space, name )
+KexiFlowLayout::KexiFlowLayout(TQLayout* parent, int space, const char *name)
+ : TQLayout( parent, space, name )
 {
 	m_orientation =Qt::Horizontal;
 	m_justify = false;
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index e410fb835..83d2f172a 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -27,8 +27,8 @@
 class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 {
 	public:
-		KexiFlowLayout(TQWidget *tqparent, int border=0, int space=-1, const char *name=0);
-		KexiFlowLayout(TQLayout* tqparent, int space=-1, const char *name=0);
+		KexiFlowLayout(TQWidget *parent, int border=0, int space=-1, const char *name=0);
+		KexiFlowLayout(TQLayout* parent, int space=-1, const char *name=0);
 		KexiFlowLayout(int space=-1, const char *name=0);
 
 		~KexiFlowLayout();
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index ce92444ff..18d34447c 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -29,8 +29,8 @@
 
 #include "kexigradientwidget.h"
 
-KexiGradientWidget::KexiGradientWidget( TQWidget *tqparent, const char *name, WFlags f )
-	: TQWidget( tqparent, name, f ), p_displayMode( NoGradient ),
+KexiGradientWidget::KexiGradientWidget( TQWidget *parent, const char *name, WFlags f )
+	: TQWidget( parent, name, f ), p_displayMode( NoGradient ),
 	p_gradientType( VerticalGradient ),
 	p_color1( TQt::white ), p_color2( TQt::blue ), p_currentChild( 0 ),
 	p_opacity( 0.5 ), p_cacheDirty( true )
@@ -179,7 +179,7 @@ void KexiGradientWidget::rebuildCache( void ) {
 		Get the part of the tempPixmap that is
 		under the current child-widget.
 		*/
-		if ( TQT_BASE_OBJECT(childWidget->tqparent()) == TQT_BASE_OBJECT(this) ) {
+		if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
 			area = childWidget->tqgeometry();
 		} else {
 			area.setTopLeft( childWidget->mapTo( this,
@@ -310,11 +310,11 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
 		return;
 
 	/**
-	Exclude widgtes that don't have a tqparent.
+	Exclude widgtes that don't have a parent.
 	This happens when tqchildren are removed
 	which are in the knownWidgets-list.
 	*/
-	if ( childWidget->tqparent() == 0L )
+	if ( childWidget->parent() == 0L )
 		return;
 
 	/**
@@ -329,7 +329,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
 	Get the part of the tempPixmap that is
 	under the current child-widget.
 	*/
-	if ( TQT_BASE_OBJECT(childWidget->tqparent()) == TQT_BASE_OBJECT(this) ) {
+	if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
 		area = childWidget->tqgeometry();
 	} else {
 		area.setTopLeft( childWidget->mapTo( this,
diff --git a/kexi/widget/utils/kexigradientwidget.h b/kexi/widget/utils/kexigradientwidget.h
index 3a90add8e..05d6f68f2 100644
--- a/kexi/widget/utils/kexigradientwidget.h
+++ b/kexi/widget/utils/kexigradientwidget.h
@@ -69,7 +69,7 @@ class KEXIGUIUTILS_EXPORT KexiGradientWidget : public TQWidget {
 			EllipticGradient = KImageEffect::EllipticGradient
 		};
 
-		KexiGradientWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 );
+		KexiGradientWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
 
 		virtual ~KexiGradientWidget();
 
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index 654f3be7b..b22e0500d 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -116,8 +116,8 @@ public:
 
 //----------------------------------------------------------------
 
-KexiRecordMarker::KexiRecordMarker(TQWidget *tqparent, const char* name)
- : TQWidget(tqparent, name)
+KexiRecordMarker::KexiRecordMarker(TQWidget *parent, const char* name)
+ : TQWidget(parent, name)
  , d( new Private() )
 {
 	initRecordMarkerImages();
diff --git a/kexi/widget/utils/kexirecordmarker.h b/kexi/widget/utils/kexirecordmarker.h
index 1348ca1d4..e309c5a16 100644
--- a/kexi/widget/utils/kexirecordmarker.h
+++ b/kexi/widget/utils/kexirecordmarker.h
@@ -34,7 +34,7 @@ class KEXIGUIUTILS_EXPORT KexiRecordMarker : public TQWidget
   TQ_OBJECT
 
 	public:
-		KexiRecordMarker(TQWidget *tqparent, const char* name = 0);
+		KexiRecordMarker(TQWidget *parent, const char* name = 0);
 		~KexiRecordMarker();
 
 		int rows() const;
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 6fe7fbdc4..4c1dd02b0 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -65,14 +65,14 @@ KexiRecordNavigatorHandler::~KexiRecordNavigatorHandler()
 
 //--------------------------------------------------
 
-KexiRecordNavigator::KexiRecordNavigator(TQWidget *tqparent, int leftMargin, const char *name)
- : TQFrame(tqparent, name)
+KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const char *name)
+ : TQFrame(parent, name)
  , m_view(0)
  , m_isInsertingEnabled(true)
  , d( new KexiRecordNavigatorPrivate() )
 {
-	if (tqparent->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING))
-		setParentView( dynamic_cast<TQScrollView*>(tqparent) );
+	if (parent->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING))
+		setParentView( dynamic_cast<TQScrollView*>(parent) );
 	setFrameStyle(TQFrame::NoFrame);
 	d->lyr = new TQHBoxLayout(this,0,0,"nav_lyr");
 
diff --git a/kexi/widget/utils/kexirecordnavigator.h b/kexi/widget/utils/kexirecordnavigator.h
index 29faf1158..9eae328b3 100644
--- a/kexi/widget/utils/kexirecordnavigator.h
+++ b/kexi/widget/utils/kexirecordnavigator.h
@@ -68,7 +68,7 @@ class KEXIGUIUTILS_EXPORT KexiRecordNavigator : public TQFrame
   TQ_OBJECT
 
 	public:
-		KexiRecordNavigator(TQWidget *tqparent, int leftMargin = 0, const char *name=0);
+		KexiRecordNavigator(TQWidget *parent, int leftMargin = 0, const char *name=0);
 		virtual ~KexiRecordNavigator();
 
 		void setParentView(TQScrollView *view);
diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp
index d5df13aa8..7d71752c1 100644
--- a/kexi/widget/utils/kexitooltip.cpp
+++ b/kexi/widget/utils/kexitooltip.cpp
@@ -29,8 +29,8 @@
 #include <tqtimer.h>
 
 
-KexiToolTip::KexiToolTip(const TQVariant& value, TQWidget* tqparent)
- : TQWidget(tqparent, "KexiToolTip", TQt::WStyle_Customize | TQt::WType_Popup | TQt::WStyle_NoBorder 
+KexiToolTip::KexiToolTip(const TQVariant& value, TQWidget* parent)
+ : TQWidget(parent, "KexiToolTip", TQt::WStyle_Customize | TQt::WType_Popup | TQt::WStyle_NoBorder 
 	| TQt::WX11BypassWM | TQt::WDestructiveClose)
  , m_value(value)
 {
diff --git a/kexi/widget/utils/kexitooltip.h b/kexi/widget/utils/kexitooltip.h
index 3ff931206..cfa1b4838 100644
--- a/kexi/widget/utils/kexitooltip.h
+++ b/kexi/widget/utils/kexitooltip.h
@@ -29,7 +29,7 @@ class KEXIGUIUTILS_EXPORT KexiToolTip : public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiToolTip(const TQVariant& value, TQWidget* tqparent);
+		KexiToolTip(const TQVariant& value, TQWidget* parent);
 		virtual ~KexiToolTip();
 
 		virtual TQSize tqsizeHint() const;
diff --git a/kexi/widget/utils/klistviewitemtemplate.h b/kexi/widget/utils/klistviewitemtemplate.h
index 3807d43cb..45a5b8896 100644
--- a/kexi/widget/utils/klistviewitemtemplate.h
+++ b/kexi/widget/utils/klistviewitemtemplate.h
@@ -27,22 +27,22 @@ template<class type>
 class KListViewItemTemplate : public KListViewItem
 {
 	public:
-		KListViewItemTemplate(type _data, TQListView *tqparent)
-		 : KListViewItem(tqparent), data(_data) {}
-		KListViewItemTemplate(type _data, TQListViewItem *tqparent)
-		 : KListViewItem(tqparent), data(_data) {}
-		KListViewItemTemplate(type _data, TQListView *tqparent, TQListViewItem *after)
-		 : KListViewItem(tqparent, after), data(_data) {}
-		KListViewItemTemplate(type _data, TQListViewItem *tqparent, TQListViewItem *after)
-		 : KListViewItem(tqparent, after), data(_data) {}
-		KListViewItemTemplate(type _data, TQListView *tqparent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
-		 : KListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
-		KListViewItemTemplate(type _data, TQListViewItem *tqparent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
-		 : KListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
-		KListViewItemTemplate(type _data, TQListView *tqparent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
-		 : KListViewItem(tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
-		KListViewItemTemplate(type _data, TQListViewItem *tqparent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
-		 : KListViewItem(tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+		KListViewItemTemplate(type _data, TQListView *parent)
+		 : KListViewItem(parent), data(_data) {}
+		KListViewItemTemplate(type _data, TQListViewItem *parent)
+		 : KListViewItem(parent), data(_data) {}
+		KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after)
+		 : KListViewItem(parent, after), data(_data) {}
+		KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after)
+		 : KListViewItem(parent, after), data(_data) {}
+		KListViewItemTemplate(type _data, TQListView *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+		 : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+		KListViewItemTemplate(type _data, TQListViewItem *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+		 : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+		KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+		 : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+		KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+		 : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
 		
 		type data;
 };
diff --git a/kformula/DESIGN b/kformula/DESIGN
index d457695f4..0e8280432 100644
--- a/kformula/DESIGN
+++ b/kformula/DESIGN
@@ -20,16 +20,16 @@ Responsebilities
 (This goes for every derived element and therefore for each one.)
 
 - knows its tqchildren. Actually BasicElement doesn't have any. But it
-  already defines that tqchildren must be known by their tqparent.
+  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 tqparent)
+  handled by the parent)
 //- 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); tqchildren are drawn, too
 - knows all positions where the cursor is allowed to be. (see below)
-- knows its tqparent; The topmost element has no tqparent; there is a
+- 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)
@@ -63,11 +63,11 @@ between parenthesis" i.e. as content child of a delimiterelement)
 FormulaElement from SequenceElement
 --------------
 
-The only element those tqparent is null. The root of the element object
+The only element those parent is null. The root of the element object
 tree.
 
 This is the element that is created by the KFormulaDoc and that knows
-about it. As every other element knows its tqparent and therefore the
+about it. As every other element knows its parent and therefore the
 FormulaElement we get a chance to pass messages to the outside world.
 
 
@@ -130,7 +130,7 @@ GeometryElement from BasicElement
 ---------------
 
 One child.
-Draw it at a fixed position relative to tqparent or absolute.
+Draw it at a fixed position relative to parent or absolute.
 This is to do dirty things.
 
 This element must not be used, kformula will provide you everything
@@ -192,9 +192,9 @@ before, between and after its tqchildren, too.
 
 - 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 tqparent.
+cursor. If there is child left the cursor is passed to the parent.
 
-- If the cursor comes from our tqparent the first or the last child gets
+- If the cursor comes from our parent the first or the last child gets
 it. Depending on the direction in which the cursor moved.
 
 Please note that because each element knows its own cursor positions
diff --git a/kformula/formulastring.cc b/kformula/formulastring.cc
index 5d2c5b8f9..b22c85768 100644
--- a/kformula/formulastring.cc
+++ b/kformula/formulastring.cc
@@ -35,8 +35,8 @@
 #include "kformula_view.h"
 
 
-FormulaString::FormulaString( KFormulaPartView* tqparent, const char* name, bool modal, WFlags fl )
-    : TQDialog( tqparent, name, modal, fl ), view( tqparent )
+FormulaString::FormulaString( KFormulaPartView* parent, const char* name, bool modal, WFlags fl )
+    : TQDialog( parent, name, modal, fl ), view( parent )
 {
     if ( !name )
 	setName( "FormulaString" );
diff --git a/kformula/formulastring.h b/kformula/formulastring.h
index 2ee9b5f33..027228eb3 100644
--- a/kformula/formulastring.h
+++ b/kformula/formulastring.h
@@ -38,7 +38,7 @@ class FormulaString : public TQDialog
   TQ_OBJECT
 
 public:
-    FormulaString( KFormulaPartView* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    FormulaString( KFormulaPartView* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~FormulaString();
 
     TQTextEdit* textWidget;
diff --git a/kformula/kfconfig.cc b/kformula/kfconfig.cc
index 2e99e67a7..e461223c7 100644
--- a/kformula/kfconfig.cc
+++ b/kformula/kfconfig.cc
@@ -29,20 +29,20 @@
 #include "kformula_view.h"
 
 
-KFConfig::KFConfig( KFormulaPartView* tqparent )
+KFConfig::KFConfig( KFormulaPartView* parent )
     : KDialogBase( KDialogBase::IconList, i18n( "Configure KFormula" ),
                    KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Default,
-                   KDialogBase::Ok, tqparent )
+                   KDialogBase::Ok, parent )
 {
     //kdDebug( 40000 ) << "KFConfig::KFConfig" << endl;
     TQVBox* page1 = addVBoxPage( i18n( "Formula" ), i18n( "Formula Settings" ),
                                BarIcon( "kformula", KIcon::SizeMedium ) );
-    _page = new KFormula::ConfigurePage( tqparent->document()->getDocument(), this,
+    _page = new KFormula::ConfigurePage( parent->document()->getDocument(), this,
                                          KFormulaFactory::global()->config(),
                                          page1 );
 //     TQVBox* page2 = addVBoxPage( i18n( "Math Fonts" ), i18n( "Math Fonts Settings" ),
 //                                BarIcon( "kformula", KIcon::SizeMedium ) );
-//     _mathFontPage = new KFormula::MathFontsConfigurePage( tqparent->document()->getDocument(), this,
+//     _mathFontPage = new KFormula::MathFontsConfigurePage( parent->document()->getDocument(), this,
 //                                          KFormulaFactory::global()->config(),
 //                                          page2 );
 
diff --git a/kformula/kfconfig.h b/kformula/kfconfig.h
index cc23c371e..6d2258b36 100644
--- a/kformula/kfconfig.h
+++ b/kformula/kfconfig.h
@@ -36,7 +36,7 @@ class KFConfig : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KFConfig( KFormulaPartView* tqparent );
+    KFConfig( KFormulaPartView* parent );
 
 public slots:
     void slotApply();
diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cc
index 98c25b46c..c5d1326c4 100644
--- a/kformula/kformula_doc.cc
+++ b/kformula/kformula_doc.cc
@@ -55,8 +55,8 @@
 #include <kformuladocument.h>
 
 
-KFormulaDoc::KFormulaDoc(TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode)
-        : KoDocument(parentWidget, widgetName, tqparent, name, singleViewMode)
+KFormulaDoc::KFormulaDoc(TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode)
+        : KoDocument(parentWidget, widgetName, parent, name, singleViewMode)
 {
     setInstance(KFormulaFactory::global(), false);
     //kdDebug(39001) << "General Settings" << endl;
@@ -183,7 +183,7 @@ bool KFormulaDoc::saveNativeFormat( const TQString & file )
         else
             return false;
     }
-    // If it's not MathML, let the tqparent handle it
+    // If it's not MathML, let the parent handle it
     return KoDocument::saveNativeFormat( file );
 }
 
@@ -212,12 +212,12 @@ bool KFormulaDoc::initDoc(InitDocFlags /*flags*/, TQWidget* /*parentWidget*/)
     return TRUE;
 }
 
-void KFormulaDoc::showStartUpWidget(KoMainWindow* tqparent, bool /*alwaysShow*/)
+void KFormulaDoc::showStartUpWidget(KoMainWindow* parent, bool /*alwaysShow*/)
 {
-    tqparent->setRootDocument( this );
+    parent->setRootDocument( this );
 }
 
-bool KFormulaDoc::showEmbedInitDialog(TQWidget* /*tqparent*/)
+bool KFormulaDoc::showEmbedInitDialog(TQWidget* /*parent*/)
 {
   return true;
 }
diff --git a/kformula/kformula_doc.h b/kformula/kformula_doc.h
index 81ba62a73..d01ce2a3d 100644
--- a/kformula/kformula_doc.h
+++ b/kformula/kformula_doc.h
@@ -55,7 +55,7 @@ public:
 
     KFormulaDoc(TQWidget *parentWidget = 0,
                 const char *widgetName = 0,
-                TQObject* tqparent = 0,
+                TQObject* parent = 0,
                 const char* name = 0,
                 bool singleViewMode = false);
     ~KFormulaDoc();
@@ -63,8 +63,8 @@ public:
     virtual void paintContent( TQPainter &painter, const TQRect &rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
 
     virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
-    virtual void showStartUpWidget(KoMainWindow* tqparent, bool alwaysShow = false);
-    virtual bool showEmbedInitDialog(TQWidget* tqparent);
+    virtual void showStartUpWidget(KoMainWindow* parent, bool alwaysShow = false);
+    virtual bool showEmbedInitDialog(TQWidget* parent);
     virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* );
     virtual bool loadXML(TQIODevice *, const TQDomDocument& doc);
     virtual TQDomDocument saveXML();
@@ -88,7 +88,7 @@ protected slots:
 protected:
 
     virtual TQString configFile() const;
-    virtual KoView* createViewInstance(TQWidget* tqparent, const char* name);
+    virtual KoView* createViewInstance(TQWidget* parent, const char* name);
 
 private:
 
diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc
index de1a17b00..e8d3a9187 100644
--- a/kformula/kformula_factory.cc
+++ b/kformula/kformula_factory.cc
@@ -25,8 +25,8 @@ KAboutData* KFormulaFactory::aboutData()
 }
 
 
-KFormulaFactory::KFormulaFactory( TQObject* tqparent, const char* name )
-    : KoFactory( tqparent, name )
+KFormulaFactory::KFormulaFactory( TQObject* parent, const char* name )
+    : KoFactory( parent, name )
 {
     // Create our instance, so that it becomes KGlobal::instance if the
     // main app is KFormula.
@@ -41,11 +41,11 @@ KFormulaFactory::~KFormulaFactory()
   s_global = 0L;
 }
 
-KParts::Part* KFormulaFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* KFormulaFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & )
 {
   bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-  KFormulaDoc *doc = new KFormulaDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
+  KFormulaDoc *doc = new KFormulaDoc( parentWidget, widgetName, parent, name, !bWantKoDocument );
 
   if ( !bWantKoDocument )
     doc->setReadWrite( false );
diff --git a/kformula/kformula_factory.h b/kformula/kformula_factory.h
index 5e7979e05..6cece4419 100644
--- a/kformula/kformula_factory.h
+++ b/kformula/kformula_factory.h
@@ -13,10 +13,10 @@ class KFormulaFactory : public KoFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    KFormulaFactory( TQObject* tqparent = 0, const char* name = 0 );
+    KFormulaFactory( TQObject* parent = 0, const char* name = 0 );
     ~KFormulaFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/kformula/kformulawidget.cc b/kformula/kformulawidget.cc
index b6a9145b2..dc2593202 100644
--- a/kformula/kformulawidget.cc
+++ b/kformula/kformulawidget.cc
@@ -34,8 +34,8 @@
 
 
 KFormulaWidget::KFormulaWidget(KFormula::Container* doc,
-                               TQWidget* tqparent, const char* name, WFlags f)
-    : TQWidget(tqparent, name, f | WRepaintNoErase | WResizeNoErase),
+                               TQWidget* parent, const char* name, WFlags f)
+    : TQWidget(parent, name, f | WRepaintNoErase | WResizeNoErase),
       formulaView(doc)
 {
     connect(doc, TQT_SIGNAL(formulaChanged(int, int)),
diff --git a/kformula/kformulawidget.h b/kformula/kformulawidget.h
index f49757b7e..43bb701f9 100644
--- a/kformula/kformulawidget.h
+++ b/kformula/kformulawidget.h
@@ -46,7 +46,7 @@ class KFormulaWidget : public TQWidget {
   TQ_OBJECT
 
 public:
-    KFormulaWidget(KFormula::Container*, TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+    KFormulaWidget(KFormula::Container*, TQWidget* parent=0, const char* name=0, WFlags f=0);
     ~KFormulaWidget();
 
 
diff --git a/kivio/kiviopart/addstenciltool.cpp b/kivio/kiviopart/addstenciltool.cpp
index e195af694..7e7a0becb 100644
--- a/kivio/kiviopart/addstenciltool.cpp
+++ b/kivio/kiviopart/addstenciltool.cpp
@@ -32,8 +32,8 @@
 
 namespace Kivio {
 
-AddStencilTool::AddStencilTool(KivioView* tqparent)
- : MouseTool(tqparent, "Add Stencil Mouse Tool")
+AddStencilTool::AddStencilTool(KivioView* parent)
+ : MouseTool(parent, "Add Stencil Mouse Tool")
 {
   m_leftMouseButtonPressed = false;
   m_stencil = 0;
diff --git a/kivio/kiviopart/addstenciltool.h b/kivio/kiviopart/addstenciltool.h
index 291646860..e9a7cef82 100644
--- a/kivio/kiviopart/addstenciltool.h
+++ b/kivio/kiviopart/addstenciltool.h
@@ -36,7 +36,7 @@ class AddStencilTool : public MouseTool
   Q_OBJECT
   TQ_OBJECT
   public:
-    AddStencilTool(KivioView* tqparent);
+    AddStencilTool(KivioView* parent);
     ~AddStencilTool();
 
     virtual bool processEvent(TQEvent* e);
diff --git a/kivio/kiviopart/kivio_dlg_pageshow.cpp b/kivio/kiviopart/kivio_dlg_pageshow.cpp
index 5c9addb6e..6381d76bf 100644
--- a/kivio/kiviopart/kivio_dlg_pageshow.cpp
+++ b/kivio/kiviopart/kivio_dlg_pageshow.cpp
@@ -33,10 +33,10 @@
 #include <kdebug.h>
 #include <KoTabBar.h>
 
-KivioPageShow::KivioPageShow( KivioView* tqparent, const char* name )
-: KDialogBase( tqparent, name, true, i18n("Show Page"), Ok|Cancel, Ok )
+KivioPageShow::KivioPageShow( KivioView* parent, const char* name )
+: KDialogBase( parent, name, true, i18n("Show Page"), Ok|Cancel, Ok )
 {
-  m_pView = tqparent;
+  m_pView = parent;
 
   TQWidget* view = new TQWidget(this);
   setMainWidget(view);
diff --git a/kivio/kiviopart/kivio_dlg_pageshow.h b/kivio/kiviopart/kivio_dlg_pageshow.h
index 496f4f43f..071ec2eb8 100644
--- a/kivio/kiviopart/kivio_dlg_pageshow.h
+++ b/kivio/kiviopart/kivio_dlg_pageshow.h
@@ -32,7 +32,7 @@ class KivioPageShow: public KDialogBase
 { Q_OBJECT
   TQ_OBJECT
 public:
-  KivioPageShow( KivioView* tqparent, const char* name );
+  KivioPageShow( KivioView* parent, const char* name );
 
 public slots:
   void slotOk();
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index 778ea2b99..a7dee3d4d 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -99,8 +99,8 @@
 TQPtrList<KivioDoc>* KivioDoc::s_docs = 0;
 int KivioDoc::s_docId = 0;
 
-KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-: KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
+KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* parent, const char* name, bool singleViewMode )
+: KoDocument( parentWidget, widgetName, parent, name, singleViewMode )
 {
   dcop = 0;
   if (!s_docs)
@@ -245,13 +245,13 @@ void KivioDoc::initEmpty()
   KoDocument::initEmpty();
 }
 
-KoView* KivioDoc::createViewInstance( TQWidget* tqparent, const char* name )
+KoView* KivioDoc::createViewInstance( TQWidget* parent, const char* name )
 {
   if (!name) {
     name = "View";
   }
 
-  return new KivioView( tqparent, name, this );
+  return new KivioView( parent, name, this );
 }
 
 TQDomDocument KivioDoc::saveXML()
diff --git a/kivio/kiviopart/kivio_doc.h b/kivio/kiviopart/kivio_doc.h
index 496a5fa81..72bc3d07c 100644
--- a/kivio/kiviopart/kivio_doc.h
+++ b/kivio/kiviopart/kivio_doc.h
@@ -68,7 +68,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
   TQ_OBJECT
   friend class KivioPage;
   public:
-    KivioDoc( TQWidget *parentWidget = 0, const char* widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    KivioDoc( TQWidget *parentWidget = 0, const char* widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false );
     ~KivioDoc();
 
     virtual DCOPObject* dcopObject();
@@ -190,7 +190,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     void saveOasisSettings( KoXmlWriter &/*settingsWriter*/ );
     void loadOasisSettings( const TQDomDocument&settingsDoc );
 
-    KoView* createViewInstance( TQWidget* tqparent, const char* name );
+    KoView* createViewInstance( TQWidget* parent, const char* name );
 
     /**
     * List of stencil spawner sets
diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp
index 9badd4325..e883aa2dd 100644
--- a/kivio/kiviopart/kivio_factory.cpp
+++ b/kivio/kiviopart/kivio_factory.cpp
@@ -29,8 +29,8 @@
 KInstance* KivioFactory::s_global = 0;
 KAboutData* KivioFactory::s_aboutData = 0;
 
-KivioFactory::KivioFactory( TQObject* tqparent, const char* name )
-: KoFactory( tqparent, name )
+KivioFactory::KivioFactory( TQObject* parent, const char* name )
+: KoFactory( parent, name )
 {
   global();
 }
@@ -43,11 +43,11 @@ KivioFactory::~KivioFactory()
   s_global = 0L;
 }
 
-KParts::Part* KivioFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* KivioFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & )
 {
   bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-  KivioDoc *doc = new KivioDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
+  KivioDoc *doc = new KivioDoc( parentWidget, widgetName, parent, name, !bWantKoDocument );
 
   if ( !bWantKoDocument )
     doc->setReadWrite( false );
diff --git a/kivio/kiviopart/kivio_factory.h b/kivio/kiviopart/kivio_factory.h
index 4fe5ed1a0..cb604b535 100644
--- a/kivio/kiviopart/kivio_factory.h
+++ b/kivio/kiviopart/kivio_factory.h
@@ -28,10 +28,10 @@ class KIVIO_EXPORT KivioFactory : public KoFactory
 { Q_OBJECT
   TQ_OBJECT
 public:
-  KivioFactory( TQObject* tqparent = 0, const char* name = 0 );
+  KivioFactory( TQObject* parent = 0, const char* name = 0 );
   ~KivioFactory();
 
-  virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+  virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
   static KInstance* global();
   static KAboutData* aboutData();
diff --git a/kivio/kiviopart/kivio_icon_view.cpp b/kivio/kiviopart/kivio_icon_view.cpp
index 01e110e0a..179b6a49a 100644
--- a/kivio/kiviopart/kivio_icon_view.cpp
+++ b/kivio/kiviopart/kivio_icon_view.cpp
@@ -41,8 +41,8 @@ TQPtrList<KivioIconView> KivioIconView::objList;
  * KivioIconViewItem
  *
  **********************************************************************/
-KivioIconViewItem::KivioIconViewItem( TQIconView *tqparent )
-    : TQIconViewItem( tqparent )
+KivioIconViewItem::KivioIconViewItem( TQIconView *parent )
+    : TQIconViewItem( parent )
 {
     m_pSpawner = NULL;
     setText("stencil");
@@ -85,8 +85,8 @@ bool KivioIconViewItem::acceptDrop( const TQMimeSource * ) const
  * KivioIconView
  *
  **********************************************************************/
-KivioIconView::KivioIconView( bool _readWrite,TQWidget *tqparent, const char *name )
-: TQIconView( tqparent, name )
+KivioIconView::KivioIconView( bool _readWrite,TQWidget *parent, const char *name )
+: TQIconView( parent, name )
 {
   m_pSpawnerSet = NULL;
   m_pCurDrag = NULL;
diff --git a/kivio/kiviopart/kivio_icon_view.h b/kivio/kiviopart/kivio_icon_view.h
index fda327ef8..ec6fa1631 100644
--- a/kivio/kiviopart/kivio_icon_view.h
+++ b/kivio/kiviopart/kivio_icon_view.h
@@ -49,7 +49,7 @@ class KivioIconView : public TQIconView
     void stencilSelected(KivioStencilSpawner*);
 
   public:
-    KivioIconView( bool _readWrite,TQWidget *tqparent=0, const char *name=0 );
+    KivioIconView( bool _readWrite,TQWidget *parent=0, const char *name=0 );
     virtual ~KivioIconView();
 
     static void clearCurrentDrag();
@@ -71,7 +71,7 @@ class KivioIconViewItem : public TQIconViewItem
     KivioStencilSpawner *m_pSpawner;
 
   public:
-    KivioIconViewItem( TQIconView *tqparent );
+    KivioIconViewItem( TQIconView *parent );
     virtual ~KivioIconViewItem();
 
     void setStencilSpawner(KivioStencilSpawner*);
diff --git a/kivio/kiviopart/kivio_spawner_drag.cpp b/kivio/kiviopart/kivio_spawner_drag.cpp
index 7d952e05f..7f1ba9850 100644
--- a/kivio/kiviopart/kivio_spawner_drag.cpp
+++ b/kivio/kiviopart/kivio_spawner_drag.cpp
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 
-KivioSpawnerDrag::KivioSpawnerDrag( KivioIconView *view, TQWidget *tqparent, const char *name )
-    : TQIconDrag( tqparent, name )
+KivioSpawnerDrag::KivioSpawnerDrag( KivioIconView *view, TQWidget *parent, const char *name )
+    : TQIconDrag( parent, name )
 {
     m_pView = view;
 }
diff --git a/kivio/kiviopart/kivio_spawner_drag.h b/kivio/kiviopart/kivio_spawner_drag.h
index efc228800..9bd68dfea 100644
--- a/kivio/kiviopart/kivio_spawner_drag.h
+++ b/kivio/kiviopart/kivio_spawner_drag.h
@@ -29,7 +29,7 @@ class KivioIconView;
 class KivioSpawnerDrag : public TQIconDrag
 {
 public:
-    KivioSpawnerDrag( KivioIconView *, TQWidget *tqparent=0, const char *name=0);
+    KivioSpawnerDrag( KivioIconView *, TQWidget *parent=0, const char *name=0);
     virtual ~KivioSpawnerDrag();
 
     const char *format(int i) const;
diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp
index 4c759a2d6..4b42fa09b 100644
--- a/kivio/kiviopart/kivio_stackbar.cpp
+++ b/kivio/kiviopart/kivio_stackbar.cpp
@@ -26,8 +26,8 @@
 #include <kdebug.h>
 
 
-KivioStackBar::KivioStackBar(KivioView* view, TQWidget* tqparent, const char* name)
-  : TQDockWindow(tqparent, name), m_view(view)
+KivioStackBar::KivioStackBar(KivioView* view, TQWidget* parent, const char* name)
+  : TQDockWindow(parent, name), m_view(view)
 {
   TQDockWindow::boxLayout()->setSpacing(0);
   TQDockWindow::boxLayout()->setMargin(0);
@@ -45,7 +45,7 @@ KivioStackBar::~KivioStackBar()
 
 void KivioStackBar::insertPage( TQWidget* w, const TQString& title )
 {
-  if (TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(this)) {
+  if (TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this)) {
     w->reparent(this,TQPoint(0,0));
   }
 
diff --git a/kivio/kiviopart/kivio_stackbar.h b/kivio/kiviopart/kivio_stackbar.h
index 6a4d6b818..452956ff2 100644
--- a/kivio/kiviopart/kivio_stackbar.h
+++ b/kivio/kiviopart/kivio_stackbar.h
@@ -35,7 +35,7 @@ class KivioStackBar : public TQDockWindow
   Q_OBJECT
   TQ_OBJECT
   public:
-    KivioStackBar(KivioView* view, TQWidget* tqparent=0, const char* name=0);
+    KivioStackBar(KivioView* view, TQWidget* parent=0, const char* name=0);
     ~KivioStackBar();
   
     TQWidget* findPage(const TQString& name);
diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
index fc2bd62eb..f7ea91211 100644
--- a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
+++ b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
@@ -11,8 +11,8 @@
 #include <KoPageLayout.h>
 #include <KoUnitWidgets.h>
 
-KivioStencilGeometryPanel::KivioStencilGeometryPanel(TQWidget* tqparent)
-: TQWidget(tqparent,"KivioStencilGeometryPanel")
+KivioStencilGeometryPanel::KivioStencilGeometryPanel(TQWidget* parent)
+: TQWidget(parent,"KivioStencilGeometryPanel")
 {
   TQGridLayout* grid = new TQGridLayout(this, 4, 2, 0, 2);
 
diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.h b/kivio/kiviopart/kivio_stencil_geometry_panel.h
index b049b2f38..b5f26cf1d 100644
--- a/kivio/kiviopart/kivio_stencil_geometry_panel.h
+++ b/kivio/kiviopart/kivio_stencil_geometry_panel.h
@@ -40,7 +40,7 @@ class KivioStencilGeometryPanel : public TQWidget
     void rotationChanged(int);
 
   public:
-    KivioStencilGeometryPanel(TQWidget* tqparent);
+    KivioStencilGeometryPanel(TQWidget* parent);
     virtual ~KivioStencilGeometryPanel();
 };
 
diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp
index 657faf488..c500f34a9 100644
--- a/kivio/kiviopart/kivio_zoomaction.cpp
+++ b/kivio/kiviopart/kivio_zoomaction.cpp
@@ -24,8 +24,8 @@
 
 using namespace Kivio;
 
-ZoomAction::ZoomAction(TQObject* tqparent, const char* name)
-: TKSelectAction(tqparent,name)
+ZoomAction::ZoomAction(TQObject* parent, const char* name)
+: TKSelectAction(parent,name)
 {
   setEditable(true);
   TQStringList lst;
diff --git a/kivio/kiviopart/kivio_zoomaction.h b/kivio/kiviopart/kivio_zoomaction.h
index d3a44a01b..d4ae6f419 100644
--- a/kivio/kiviopart/kivio_zoomaction.h
+++ b/kivio/kiviopart/kivio_zoomaction.h
@@ -27,7 +27,7 @@ class ZoomAction : public TKSelectAction
 { Q_OBJECT
   TQ_OBJECT
 public:
-  ZoomAction( TQObject* tqparent, const char* name );
+  ZoomAction( TQObject* parent, const char* name );
   ~ZoomAction();
 
   void insertItem( int );
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index f4f9e6cfb..b61e877ac 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -38,8 +38,8 @@
 #include <kiconloader.h>
 
 KivioArrowHeadAction::KivioArrowHeadAction(const TQString &text, const TQString &pix,
-  TQObject* tqparent, const char *name)
-  : KActionMenu(text, pix, tqparent, name)
+  TQObject* parent, const char *name)
+  : KActionMenu(text, pix, parent, name)
 {
   m_emitSignals = true;
   setShortcutConfigurable( false );
@@ -161,7 +161,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
 
 void KivioArrowHeadAction::loadArrowHeads(KPopupMenu* popup)
 {
-  TQBitmap tqmask;
+  TQBitmap mask;
   TQPixmap pixAll = Kivio::arrowHeadPixmap();  
   TQPixmap pix(pixAll.width(), 17);
   TQPainter p(&pix, popup);
diff --git a/kivio/kiviopart/kivioarrowheadaction.h b/kivio/kiviopart/kivioarrowheadaction.h
index 08fca3948..9989d5f70 100644
--- a/kivio/kiviopart/kivioarrowheadaction.h
+++ b/kivio/kiviopart/kivioarrowheadaction.h
@@ -32,7 +32,7 @@ class KivioArrowHeadAction : public KActionMenu
   TQ_OBJECT
   public:
     KivioArrowHeadAction(const TQString &text, const TQString &pix,
-      TQObject* tqparent = 0, const char *name = 0);
+      TQObject* parent = 0, const char *name = 0);
     ~KivioArrowHeadAction();
 
     KPopupMenu* popupMenu() const;
diff --git a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp
index 23b03be66..a57af7c85 100644
--- a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp
@@ -861,9 +861,9 @@ void Kivio1DStencil::drawText( KivioIntraStencilData *pData )
   p.setPen(m_pTextStyle->color());
   p.setFont(f);
   p.drawText( 0, 0, boundRect.width(), boundRect.height(), tf, m_pTextStyle->text() );
-  TQBitmap tqmask;
-  tqmask = pix;
-  pix.setMask(tqmask);
+  TQBitmap mask;
+  mask = pix;
+  pix.setMask(mask);
   painter->drawPixmap(_x, _y, pix);
 }
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp
index f3903685b..e41f5788f 100644
--- a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp
@@ -514,17 +514,17 @@ void KivioBaseTargetStencil::copyBasicInto( KivioBaseTargetStencil *pStencil )
 int KivioBaseTargetStencil::resizeHandlePositions()
 {
    // Calculate the resize handle positions
-   int tqmask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
+   int mask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
 
    if( m_pProtection->at( kpWidth ) )
    {
-      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
+      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
    }
 
    if( m_pProtection->at( kpHeight) )
    {
-      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
+      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
    }
 
-   return tqmask;
+   return mask;
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
index 46526892c..cc8eb0e32 100644
--- a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
@@ -606,19 +606,19 @@ KivioCollisionType KivioPyStencil::checkForCollision( KoPoint *pPoint, double )
 int KivioPyStencil::resizeHandlePositions()
 {
    // Calculate the resize handle positions
-   int tqmask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
+   int mask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
 
    if( m_pProtection->at( kpWidth ) )
    {
-      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
+      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
    }
 
    if( m_pProtection->at( kpHeight) )
    {
-      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
+      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
    }
 
-   return tqmask;
+   return mask;
 }
 
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
index 1046e9d8a..6f00df1aa 100644
--- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
@@ -741,9 +741,9 @@ void KivioSMLStencil::drawOutlineTextBox( KivioShape *pShape, KivioIntraStencilD
   p.setPen( TQColor(0, 0, 0) );
   int tf = pShapeData->vTextAlign() | pShapeData->hTextAlign();
   p.drawText( 0, 0, _w, _h, tf | TQt::WordBreak, pShapeData->text() );
-  TQBitmap tqmask;
-  tqmask = pix;
-  pix.setMask(tqmask);
+  TQBitmap mask;
+  mask = pix;
+  pix.setMask(mask);
   painter->drawPixmap(_x, _y, pix);
 }
 
@@ -1976,24 +1976,24 @@ bool KivioSMLStencil::checkCollisionTextBox( KivioShape *, KoPoint * )
 int KivioSMLStencil::resizeHandlePositions()
 {
    // Calculate the resize handle positions
-   int tqmask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
+   int mask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
 
    if( m_pProtection->at( kpWidth ) )
    {
-      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
+      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
    }
 
    if( m_pProtection->at( kpHeight ) )
    {
-      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
+      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
    }
 
    if( m_pProtection->at( kpAspect ) )
    {
-      tqmask = KIVIO_RESIZE_HANDLE_POSITION_CORNERS;
+      mask = KIVIO_RESIZE_HANDLE_POSITION_CORNERS;
    }
 
-   return tqmask;
+   return mask;
 }
 
 KivioLineStyle KivioSMLStencil::lineStyle()
diff --git a/kivio/kiviopart/kiviosdk/kiviostencilfactory.h b/kivio/kiviopart/kiviosdk/kiviostencilfactory.h
index 5a00560cd..dcde79040 100644
--- a/kivio/kiviopart/kiviosdk/kiviostencilfactory.h
+++ b/kivio/kiviopart/kiviosdk/kiviostencilfactory.h
@@ -32,8 +32,8 @@ class KIVIO_EXPORT KivioStencilFactory : public TQObject
   Q_OBJECT
   TQ_OBJECT
   public:
-    KivioStencilFactory(TQObject *tqparent=0, const char*name=0, const TQStringList& args = TQStringList())
-      : TQObject(tqparent, name) { Q_UNUSED(args) }
+    KivioStencilFactory(TQObject *parent=0, const char*name=0, const TQStringList& args = TQStringList())
+      : TQObject(parent, name) { Q_UNUSED(args) }
     virtual KivioStencil *NewStencil(const TQString& name) =0;
     virtual KivioStencil *NewStencil()=0;
     virtual TQPixmap *GetIcon()=0;
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 0d3eada83..0741dfdc6 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -64,8 +64,8 @@ static const char * default_plug_xpm[] = {
 "  ##############"};
 
 KivioStencilSetAction::KivioStencilSetAction(const TQString &text, const TQString &pix,
-  KActionCollection *tqparent, const char *name)
-  : KAction(text, pix, 0, tqparent, name)
+  KActionCollection *parent, const char *name)
+  : KAction(text, pix, 0, parent, name)
 {
   setShortcutConfigurable( false );
 
diff --git a/kivio/kiviopart/kiviostencilsetaction.h b/kivio/kiviopart/kiviostencilsetaction.h
index 13cb9efea..1bee42d48 100644
--- a/kivio/kiviopart/kiviostencilsetaction.h
+++ b/kivio/kiviopart/kiviostencilsetaction.h
@@ -37,7 +37,7 @@ class KivioStencilSetAction : public KAction
   TQ_OBJECT
   public:
     KivioStencilSetAction(const TQString &text, const TQString &pix,
-      KActionCollection *tqparent, const char *name);
+      KActionCollection *parent, const char *name);
 
     virtual ~KivioStencilSetAction();
 
diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp
index 3983644cc..e0d2b363d 100644
--- a/kivio/kiviopart/kiviostencilsetinstaller.cpp
+++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp
@@ -40,8 +40,8 @@
 #include <klineedit.h>
 
 namespace Kivio {
-  StencilSetInstaller::StencilSetInstaller(TQWidget *tqparent, const char *name)
-    : KDialogBase(KDialogBase::Plain, i18n("Install Stencil Set"), Ok|Cancel, Ok, tqparent, name)
+  StencilSetInstaller::StencilSetInstaller(TQWidget *parent, const char *name)
+    : KDialogBase(KDialogBase::Plain, i18n("Install Stencil Set"), Ok|Cancel, Ok, parent, name)
   {
     TQFrame* page = plainPage();
     TQVBoxLayout* l = new TQVBoxLayout(page);
diff --git a/kivio/kiviopart/kiviostencilsetinstaller.h b/kivio/kiviopart/kiviostencilsetinstaller.h
index 80e1b25b4..c6d8c7068 100644
--- a/kivio/kiviopart/kiviostencilsetinstaller.h
+++ b/kivio/kiviopart/kiviostencilsetinstaller.h
@@ -32,7 +32,7 @@ namespace Kivio {
     Q_OBJECT
   TQ_OBJECT
     public:
-      StencilSetInstaller(TQWidget *tqparent = 0, const char *name = 0);
+      StencilSetInstaller(TQWidget *parent = 0, const char *name = 0);
       ~StencilSetInstaller();
 
     public slots:
diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp
index b44ab4c2f..d3d30dae9 100644
--- a/kivio/kiviopart/stencilbarbutton.cpp
+++ b/kivio/kiviopart/stencilbarbutton.cpp
@@ -30,8 +30,8 @@
 
 using namespace Kivio;
 
-DragBarButton::DragBarButton( const TQString& text, TQWidget* tqparent, const char* name )
-: TQPushButton(text,tqparent,name)
+DragBarButton::DragBarButton( const TQString& text, TQWidget* parent, const char* name )
+: TQPushButton(text,parent,name)
 {
   m_pIcon = 0L;
   m_bPressed = false;
diff --git a/kivio/kiviopart/stencilbarbutton.h b/kivio/kiviopart/stencilbarbutton.h
index 88bfe60b2..6f207a7fa 100644
--- a/kivio/kiviopart/stencilbarbutton.h
+++ b/kivio/kiviopart/stencilbarbutton.h
@@ -29,7 +29,7 @@ class DragBarButton : public TQPushButton
   Q_OBJECT
   TQ_OBJECT
   public:
-    DragBarButton( const TQString&, TQWidget* tqparent, const char* name = 0 );
+    DragBarButton( const TQString&, TQWidget* parent, const char* name = 0 );
     ~DragBarButton();
   
     void setIcon( const TQString& );
diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp
index d0121dd0a..ecf923f93 100644
--- a/kivio/kiviopart/stencilbardockmanager.cpp
+++ b/kivio/kiviopart/stencilbardockmanager.cpp
@@ -34,12 +34,12 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-StencilBarDockManager::StencilBarDockManager( KivioView* tqparent, const char* name )
-: TQWidget(tqparent,name)
+StencilBarDockManager::StencilBarDockManager( KivioView* parent, const char* name )
+: TQWidget(parent,name)
 {
   dragButton = 0L;
   dragWidget = 0L;
-  m_pView = tqparent;
+  m_pView = parent;
   m_destinationBar = 0L;
   dragPos = OnDesktop;
 
@@ -323,8 +323,8 @@ KoToolDockMoveManager::KoToolDockMoveManager()
     gv.line_width = 2;
     gv.foreground = WhitePixel(qt_xdisplay(), scr)^BlackPixel(qt_xdisplay(), scr);
     gv.subwindow_mode = IncludeInferiors;
-    long tqmask = GCForeground | GCFunction | GCLineWidth | GCSubwindowMode;
-    rootgc = XCreateGC(qt_xdisplay(), qt_xrootwin(), tqmask, &gv);
+    long mask = GCForeground | GCFunction | GCLineWidth | GCSubwindowMode;
+    rootgc = XCreateGC(qt_xdisplay(), qt_xrootwin(), mask, &gv);
 #endif
 
     timer = new TQTimer(this);
diff --git a/kivio/kiviopart/stencilbardockmanager.h b/kivio/kiviopart/stencilbardockmanager.h
index 8894def1a..8406e5f07 100644
--- a/kivio/kiviopart/stencilbardockmanager.h
+++ b/kivio/kiviopart/stencilbardockmanager.h
@@ -57,7 +57,7 @@ class StencilBarDockManager : public TQWidget
       OnTopLevelBar = 6
     };
   
-    StencilBarDockManager( KivioView* tqparent, const char* name = 0 );
+    StencilBarDockManager( KivioView* parent, const char* name = 0 );
     ~StencilBarDockManager();
   
     void insertStencilSet( TQWidget*,  const TQString&, BarPos = AutoSelect,
diff --git a/kivio/kiviopart/tools/kivio_mousetool.cpp b/kivio/kiviopart/tools/kivio_mousetool.cpp
index 77b55d013..e74d01478 100644
--- a/kivio/kiviopart/tools/kivio_mousetool.cpp
+++ b/kivio/kiviopart/tools/kivio_mousetool.cpp
@@ -21,7 +21,7 @@
 #include "kivio_pluginmanager.h"
 
 namespace Kivio {
-  MouseTool::MouseTool(KivioView* tqparent, const char* name) : Kivio::Plugin(tqparent, name)
+  MouseTool::MouseTool(KivioView* parent, const char* name) : Kivio::Plugin(parent, name)
   {
     connect(this, TQT_SIGNAL(activated(Kivio::MouseTool*)), view()->pluginManager(), TQT_SLOT(activate(Kivio::MouseTool*)));
   }
diff --git a/kivio/kiviopart/tools/kivio_mousetool.h b/kivio/kiviopart/tools/kivio_mousetool.h
index 7bffaf33b..0b717f296 100644
--- a/kivio/kiviopart/tools/kivio_mousetool.h
+++ b/kivio/kiviopart/tools/kivio_mousetool.h
@@ -34,7 +34,7 @@ namespace Kivio {
     Q_OBJECT
   TQ_OBJECT
     public:
-      MouseTool(KivioView* tqparent = 0, const char* name = 0);
+      MouseTool(KivioView* parent = 0, const char* name = 0);
       ~MouseTool();
     
       virtual bool processEvent(TQEvent* e) = 0;
diff --git a/kivio/kiviopart/tools/kivio_plugin.cpp b/kivio/kiviopart/tools/kivio_plugin.cpp
index 12128f608..7e227fb1f 100644
--- a/kivio/kiviopart/tools/kivio_plugin.cpp
+++ b/kivio/kiviopart/tools/kivio_plugin.cpp
@@ -21,7 +21,7 @@
 #include "kivio_factory.h"
 
 namespace Kivio {
-  Plugin::Plugin(KivioView* tqparent, const char* name) : KParts::Plugin(TQT_TQOBJECT(tqparent), name)
+  Plugin::Plugin(KivioView* parent, const char* name) : KParts::Plugin(TQT_TQOBJECT(parent), name)
   {
     setInstance(KivioFactory::global());
   }
diff --git a/kivio/kiviopart/tools/kivio_plugin.h b/kivio/kiviopart/tools/kivio_plugin.h
index 944742d3d..cd261eabf 100644
--- a/kivio/kiviopart/tools/kivio_plugin.h
+++ b/kivio/kiviopart/tools/kivio_plugin.h
@@ -32,10 +32,10 @@ namespace Kivio {
     Q_OBJECT
   TQ_OBJECT
     public:
-      Plugin(KivioView* tqparent = 0, const char* name = 0);
+      Plugin(KivioView* parent = 0, const char* name = 0);
       ~Plugin();
       
-      KivioView* view() { return static_cast<KivioView*>(TQT_TQWIDGET(tqparent())); }
+      KivioView* view() { return static_cast<KivioView*>(TQT_TQWIDGET(parent())); }
   };
 }
 
diff --git a/kivio/kiviopart/tools/kivio_pluginmanager.cpp b/kivio/kiviopart/tools/kivio_pluginmanager.cpp
index 89f7f0a70..9b99904e5 100644
--- a/kivio/kiviopart/tools/kivio_pluginmanager.cpp
+++ b/kivio/kiviopart/tools/kivio_pluginmanager.cpp
@@ -24,7 +24,7 @@
 #include "kivio_plugin.h"
 
 namespace Kivio {
-  PluginManager::PluginManager(KivioView* tqparent, const char* name) : TQObject(tqparent, name)
+  PluginManager::PluginManager(KivioView* parent, const char* name) : TQObject(parent, name)
   {
     m_activeTool = 0;
     m_defaultTool = 0;
@@ -83,7 +83,7 @@ namespace Kivio {
 
   Kivio::Plugin* PluginManager::findPlugin(const TQString& name)
   {
-    TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(tqparent());
+    TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(parent());
     KParts::Plugin* p = plugins.first();
     bool found = false;
     
diff --git a/kivio/kiviopart/tools/kivio_pluginmanager.h b/kivio/kiviopart/tools/kivio_pluginmanager.h
index a0ac51fe9..ced84748e 100644
--- a/kivio/kiviopart/tools/kivio_pluginmanager.h
+++ b/kivio/kiviopart/tools/kivio_pluginmanager.h
@@ -32,7 +32,7 @@ namespace Kivio {
     Q_OBJECT
   TQ_OBJECT
     public:
-      PluginManager(KivioView* tqparent, const char* name = 0);
+      PluginManager(KivioView* parent, const char* name = 0);
       ~PluginManager();
 
       bool delegateEvent(TQEvent* e);
diff --git a/kivio/kiviopart/tools/mousetoolaction.cpp b/kivio/kiviopart/tools/mousetoolaction.cpp
index 262382130..e46e522ce 100644
--- a/kivio/kiviopart/tools/mousetoolaction.cpp
+++ b/kivio/kiviopart/tools/mousetoolaction.cpp
@@ -25,50 +25,50 @@
 namespace Kivio {
 
 MouseToolAction::MouseToolAction(const TQString& text, const KShortcut& cut,
-                            TQObject* tqparent, const char* name)
-  : KRadioAction(text, cut, tqparent, name)
+                            TQObject* parent, const char* name)
+  : KRadioAction(text, cut, parent, name)
 {
 }
 
 MouseToolAction::MouseToolAction(const TQString& text, const KShortcut& cut,
                             const TQObject* receiver, const char* slot,
-                            TQObject* tqparent, const char* name)
-  : KRadioAction(text, cut, receiver, slot, tqparent, name)
+                            TQObject* parent, const char* name)
+  : KRadioAction(text, cut, receiver, slot, parent, name)
 {
 }
 
 MouseToolAction::MouseToolAction(const TQString& text, const TQIconSet& pix,
                             const KShortcut& cut,
-                            TQObject* tqparent, const char* name)
-  : KRadioAction(text, pix, cut, tqparent, name)
+                            TQObject* parent, const char* name)
+  : KRadioAction(text, pix, cut, parent, name)
 {
 }
 
 MouseToolAction::MouseToolAction(const TQString& text, const TQString& pix,
                             const KShortcut& cut,
-                            TQObject* tqparent, const char* name)
-  : KRadioAction(text, pix, cut, tqparent, name)
+                            TQObject* parent, const char* name)
+  : KRadioAction(text, pix, cut, parent, name)
 {
 }
 
 MouseToolAction::MouseToolAction(const TQString& text, const TQIconSet& pix,
                             const KShortcut& cut,
                             const TQObject* receiver, const char* slot,
-                            TQObject* tqparent, const char* name)
-  : KRadioAction(text, pix, cut, receiver, slot, tqparent, name)
+                            TQObject* parent, const char* name)
+  : KRadioAction(text, pix, cut, receiver, slot, parent, name)
 {
 }
 
 MouseToolAction::MouseToolAction(const TQString& text, const TQString& pix,
                             const KShortcut& cut,
                             const TQObject* receiver, const char* slot,
-                            TQObject* tqparent, const char* name)
-  : KRadioAction(text, pix, cut, receiver, slot, tqparent, name)
+                            TQObject* parent, const char* name)
+  : KRadioAction(text, pix, cut, receiver, slot, parent, name)
 {
 }
 
-MouseToolAction::MouseToolAction(TQObject* tqparent, const char* name)
-  : KRadioAction(tqparent, name)
+MouseToolAction::MouseToolAction(TQObject* parent, const char* name)
+  : KRadioAction(parent, name)
 {
 }
 
diff --git a/kivio/kiviopart/tools/mousetoolaction.h b/kivio/kiviopart/tools/mousetoolaction.h
index 0e528578c..26351ff2e 100644
--- a/kivio/kiviopart/tools/mousetoolaction.h
+++ b/kivio/kiviopart/tools/mousetoolaction.h
@@ -36,72 +36,72 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction
     *
     * @param text The text that will be displayed.
     * @param cut The corresponding keyboard accelerator (shortcut).
-    * @param tqparent This action's tqparent.
+    * @param parent This action's parent.
     * @param name An internal name for this action.
       */
-    MouseToolAction(const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0);
+    MouseToolAction(const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
       *  @param cut The corresponding keyboard accelerator (shortcut).
-      *  @param receiver The SLOT's tqparent.
+      *  @param receiver The SLOT's parent.
       *  @param slot The TQT_SLOT to invoke to execute this action.
-      *  @param tqparent This action's tqparent.
+      *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
     MouseToolAction(const TQString& text, const KShortcut& cut,
-                  const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0);
+                  const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
       *  @param pix The icons that go with this action.
       *  @param cut The corresponding keyboard accelerator (shortcut).
-      *  @param tqparent This action's tqparent.
+      *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
     MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
-                  TQObject* tqparent = 0, const char* name = 0);
+                  TQObject* parent = 0, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
       *  @param pix The dynamically loaded icon that goes with this action.
       *  @param cut The corresponding keyboard accelerator (shortcut).
-      *  @param tqparent This action's tqparent.
+      *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
     MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
-                  TQObject* tqparent = 0, const char* name = 0);
+                  TQObject* parent = 0, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
       *  @param pix The icons that go with this action.
       *  @param cut The corresponding keyboard accelerator (shortcut).
-      *  @param receiver The SLOT's tqparent.
+      *  @param receiver The SLOT's parent.
       *  @param slot The TQT_SLOT to invoke to execute this action.
-      *  @param tqparent This action's tqparent.
+      *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
     MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut,
-                  const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0);
+                  const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
       *  @param pix The dynamically loaded icon that goes with this action.
       *  @param cut The corresponding keyboard accelerator (shortcut).
-      *  @param receiver The SLOT's tqparent.
+      *  @param receiver The SLOT's parent.
       *  @param slot The TQT_SLOT to invoke to execute this action.
-      *  @param tqparent This action's tqparent.
+      *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
     MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut,
                   const TQObject* receiver, const char* slot,
-                  TQObject* tqparent, const char* name = 0);
+                  TQObject* parent, const char* name = 0);
   
     /**
-      *  @param tqparent This action's tqparent.
+      *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(TQObject* tqparent = 0, const char* name = 0);
+    MouseToolAction(TQObject* parent = 0, const char* name = 0);
 
     ~MouseToolAction();
 
diff --git a/kivio/kiviopart/ui/addstencilsetdialog.cpp b/kivio/kiviopart/ui/addstencilsetdialog.cpp
index 683363674..b37c001f1 100644
--- a/kivio/kiviopart/ui/addstencilsetdialog.cpp
+++ b/kivio/kiviopart/ui/addstencilsetdialog.cpp
@@ -24,8 +24,8 @@
 
 namespace Kivio {
 
-AddStencilSetDialog::AddStencilSetDialog(TQWidget *tqparent, const char *name)
-  : KDialogBase(tqparent, name, false, i18n("Stencil Sets"), KDialogBase::Close)
+AddStencilSetDialog::AddStencilSetDialog(TQWidget *parent, const char *name)
+  : KDialogBase(parent, name, false, i18n("Stencil Sets"), KDialogBase::Close)
 {
   m_mainWidget = new AddStencilSetPanel(this);
   setMainWidget(m_mainWidget);
diff --git a/kivio/kiviopart/ui/addstencilsetdialog.h b/kivio/kiviopart/ui/addstencilsetdialog.h
index 0f23d9198..27a42cfa9 100644
--- a/kivio/kiviopart/ui/addstencilsetdialog.h
+++ b/kivio/kiviopart/ui/addstencilsetdialog.h
@@ -30,7 +30,7 @@ class AddStencilSetDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    AddStencilSetDialog(TQWidget *tqparent = 0, const char *name = 0);
+    AddStencilSetDialog(TQWidget *parent = 0, const char *name = 0);
     ~AddStencilSetDialog();
 
   public slots:
diff --git a/kivio/kiviopart/ui/export_page_dialog.cpp b/kivio/kiviopart/ui/export_page_dialog.cpp
index 94feb1421..61e8a56ed 100644
--- a/kivio/kiviopart/ui/export_page_dialog.cpp
+++ b/kivio/kiviopart/ui/export_page_dialog.cpp
@@ -9,8 +9,8 @@
 #include "export_page_dialog_base.h"
 #include "kivio_config.h"
 
-ExportPageDialog::ExportPageDialog( TQWidget *tqparent, const char *name )
-   : KDialogBase(tqparent, name, true, i18n("Export Page"), Ok|Cancel, Ok)
+ExportPageDialog::ExportPageDialog( TQWidget *parent, const char *name )
+   : KDialogBase(parent, name, true, i18n("Export Page"), Ok|Cancel, Ok)
 {
   m_view = new ExportPageDialogBase(this);
   setMainWidget(m_view);
diff --git a/kivio/kiviopart/ui/export_page_dialog.h b/kivio/kiviopart/ui/export_page_dialog.h
index 0384b0ba4..a3251e691 100644
--- a/kivio/kiviopart/ui/export_page_dialog.h
+++ b/kivio/kiviopart/ui/export_page_dialog.h
@@ -10,7 +10,7 @@ class ExportPageDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    ExportPageDialog(TQWidget* tqparent=0, const char* name=0);
+    ExportPageDialog(TQWidget* parent=0, const char* name=0);
 
     int quality();
     int border();
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 546c32035..5185dfc6f 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -27,8 +27,8 @@
 
 #define TOGGLE_ACTION(X) ((KToggleAction*)child(X))
 
-KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, TQWidget* tqparent, const char* name)
-: KivioBirdEyePanelBase(tqparent, name), m_pView(view), m_pCanvas(view->canvasWidget()), m_pDoc(view->doc())
+KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, TQWidget* parent, const char* name)
+: KivioBirdEyePanelBase(parent, name), m_pView(view), m_pCanvas(view->canvasWidget()), m_pDoc(view->doc())
 {
   handlePress = false;
   m_buffer = new TQPixmap();
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.h b/kivio/kiviopart/ui/kivio_birdeye_panel.h
index 1138663c0..6dc388e02 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.h
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.h
@@ -34,7 +34,7 @@ class KivioBirdEyePanel : public KivioBirdEyePanelBase
 { Q_OBJECT
   TQ_OBJECT
 public:
-  KivioBirdEyePanel(KivioView* view, TQWidget* tqparent=0, const char* name=0);
+  KivioBirdEyePanel(KivioView* view, TQWidget* parent=0, const char* name=0);
   ~KivioBirdEyePanel();
 
   bool eventFilter(TQObject*, TQEvent*);
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp
index 2e92bd00a..fadba0e3d 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp
@@ -35,8 +35,8 @@
 #include <kiconloader.h>
 #include <kinputdialog.h>
 
-KivioLayerItem::KivioLayerItem(TQListView* tqparent, KivioLayer* d, int id)
-: TQListViewItem(tqparent), data(d)
+KivioLayerItem::KivioLayerItem(TQListView* parent, KivioLayer* d, int id)
+: TQListViewItem(parent), data(d)
 {
   TQString ids;
   TQString space;
@@ -63,8 +63,8 @@ void KivioLayerItem::update()
 
 
 /*********************************************************/
-KivioLayerPanel::KivioLayerPanel(KivioView* view, TQWidget* tqparent, const char* name)
-: KivioLayerPanelBase(tqparent, name), m_pView(view)
+KivioLayerPanel::KivioLayerPanel(KivioView* view, TQWidget* parent, const char* name)
+: KivioLayerPanelBase(parent, name), m_pView(view)
 {
   list->header()->hide();
   list->addColumn(i18n("View"),15);
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.h b/kivio/kiviopart/ui/kivio_layer_panel.h
index 55a908c21..b4f1e00da 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.h
+++ b/kivio/kiviopart/ui/kivio_layer_panel.h
@@ -32,7 +32,7 @@ class KivioLayerItem: public TQListViewItem
 {
   friend class KivioLayerPanel;
   public:
-    KivioLayerItem(TQListView* tqparent, KivioLayer*, int id);
+    KivioLayerItem(TQListView* parent, KivioLayer*, int id);
     ~KivioLayerItem();
 
     KivioLayer* layer() const { return data; }
@@ -51,7 +51,7 @@ class KivioLayerPanel : public KivioLayerPanelBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    KivioLayerPanel(KivioView* view, TQWidget* tqparent=0, const char* name=0);
+    KivioLayerPanel(KivioView* view, TQWidget* parent=0, const char* name=0);
     ~KivioLayerPanel();
 
     bool eventFilter(TQObject*, TQEvent*);
diff --git a/kivio/kiviopart/ui/kivio_protection_panel.cpp b/kivio/kiviopart/ui/kivio_protection_panel.cpp
index f95211517..6de8c0baf 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_protection_panel.cpp
@@ -32,8 +32,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-KivioProtectionPanel::KivioProtectionPanel( KivioView *view, TQWidget *tqparent, const char *name )
-   : KivioProtectionPanelBase(tqparent, name), m_pView(view)
+KivioProtectionPanel::KivioProtectionPanel( KivioView *view, TQWidget *parent, const char *name )
+   : KivioProtectionPanelBase(parent, name), m_pView(view)
 {
    TQObject::connect( m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool)) );
    TQObject::connect( m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool)) );
diff --git a/kivio/kiviopart/ui/kivio_protection_panel.h b/kivio/kiviopart/ui/kivio_protection_panel.h
index 3fd806951..a8a8173a7 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel.h
+++ b/kivio/kiviopart/ui/kivio_protection_panel.h
@@ -31,7 +31,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    KivioProtectionPanel( KivioView *view, TQWidget *tqparent=0, const char *name=0 );
+    KivioProtectionPanel( KivioView *view, TQWidget *parent=0, const char *name=0 );
     virtual ~KivioProtectionPanel();
 
 public slots:
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
index acc2e63a2..11c2cc286 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
@@ -38,8 +38,8 @@
 #include "kivioglobal.h"
 
 namespace Kivio {
-  AddStencilSetPanel::AddStencilSetPanel(TQWidget *tqparent, const char *name)
-    : KivioStencilSetWidget(tqparent, name)
+  AddStencilSetPanel::AddStencilSetPanel(TQWidget *parent, const char *name)
+    : KivioStencilSetWidget(parent, name)
   {
     int height = m_stencilsetGBox->height() / 2;
     TQValueList<int> sizes;
@@ -171,7 +171,7 @@ namespace Kivio {
 
   void AddStencilSetPanel::changeStencilSet(TQListViewItem* li)
   {
-    if(!li || !li->tqparent()) {
+    if(!li || !li->parent()) {
       return;
     }
     
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.h b/kivio/kiviopart/ui/kivioaddstencilsetpanel.h
index 802c54da1..30cac93bf 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.h
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.h
@@ -31,7 +31,7 @@ namespace Kivio {
     Q_OBJECT
   TQ_OBJECT
     public:
-      AddStencilSetPanel(TQWidget *tqparent = 0, const char *name = 0);
+      AddStencilSetPanel(TQWidget *parent = 0, const char *name = 0);
       ~AddStencilSetPanel();
     
     public slots:
diff --git a/kivio/kiviopart/ui/kivioaligndialog.cpp b/kivio/kiviopart/ui/kivioaligndialog.cpp
index 03f0ac3ab..b208813a7 100644
--- a/kivio/kiviopart/ui/kivioaligndialog.cpp
+++ b/kivio/kiviopart/ui/kivioaligndialog.cpp
@@ -28,8 +28,8 @@
 #include "kivio_page.h"
 #include "aligndialog.h"
 
-KivioAlignDialog::KivioAlignDialog(TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, i18n("Align & Distribute"), Ok|Cancel, Ok)
+KivioAlignDialog::KivioAlignDialog(TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, i18n("Align & Distribute"), Ok|Cancel, Ok)
 {
   m_view = new KivioAlignDialogWidget(this);
   setMainWidget(m_view);
diff --git a/kivio/kiviopart/ui/kivioaligndialog.h b/kivio/kiviopart/ui/kivioaligndialog.h
index 18808b2c8..205279993 100644
--- a/kivio/kiviopart/ui/kivioaligndialog.h
+++ b/kivio/kiviopart/ui/kivioaligndialog.h
@@ -31,7 +31,7 @@ class KivioAlignDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    KivioAlignDialog(TQWidget* tqparent = 0, const char* name = 0);
+    KivioAlignDialog(TQWidget* parent = 0, const char* name = 0);
 
     AlignData align();
 
diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
index 69312faf2..9237333e8 100644
--- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
+++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
@@ -36,8 +36,8 @@
 #include "kivio_view.h"
 #include "kivioglobal.h"
 
-KivioArrowHeadFormatDlg::KivioArrowHeadFormatDlg(KivioView* tqparent, const char* name)
-  : KDialogBase(tqparent, name, true, i18n("Arrowhead Format"), Ok|Cancel|Default, Ok)
+KivioArrowHeadFormatDlg::KivioArrowHeadFormatDlg(KivioView* parent, const char* name)
+  : KDialogBase(parent, name, true, i18n("Arrowhead Format"), Ok|Cancel|Default, Ok)
 {
   m_unit = KoUnit::U_PT;
   init();
@@ -111,7 +111,7 @@ void KivioArrowHeadFormatDlg::init()
 
 void KivioArrowHeadFormatDlg::loadArrowHeads(KComboBox* combo)
 {
-  TQBitmap tqmask;
+  TQBitmap mask;
   TQPixmap pixAll = Kivio::arrowHeadPixmap();
   TQPixmap pix(pixAll.width(), 17);
   TQPainter p(&pix, combo);
diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.h b/kivio/kiviopart/ui/kivioarrowheadformatdlg.h
index 499127982..a829873cf 100644
--- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.h
+++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.h
@@ -33,7 +33,7 @@ class KivioArrowHeadFormatDlg : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    KivioArrowHeadFormatDlg(KivioView* tqparent, const char* name = 0);
+    KivioArrowHeadFormatDlg(KivioView* parent, const char* name = 0);
 
     int startAHType();
     double startAHWidth();
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index 136b7debe..239008944 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -48,8 +48,8 @@
 #include <tqlayout.h>
 #include <tqtabwidget.h>
 
-// GuidesListViewItem::GuidesListViewItem(TQListView* tqparent, KivioGuideLineData *gd, KoUnit::Unit u)
-// : KListViewItem(tqparent), m_data(gd)
+// GuidesListViewItem::GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u)
+// : KListViewItem(parent), m_data(gd)
 // {
 //   setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ?
 //     "guides_vertical":"guides_horizontal"));
@@ -87,12 +87,12 @@
 
 /*****************************************************************************/
 
-KivioOptionsDialog::KivioOptionsDialog(KivioView* tqparent, const char* name)
-  : KDialogBase(IconList, i18n("Settings"), Ok|Cancel|Apply|Default, Ok, tqparent, name)
+KivioOptionsDialog::KivioOptionsDialog(KivioView* parent, const char* name)
+  : KDialogBase(IconList, i18n("Settings"), Ok|Cancel|Apply|Default, Ok, parent, name)
 {
   initPage();
   initGrid();
-  unitChanged(tqparent->doc()->unit());
+  unitChanged(parent->doc()->unit());
 }
 
 void KivioOptionsDialog::initPage()
@@ -101,7 +101,7 @@ void KivioOptionsDialog::initPage()
     kapp->iconLoader()->loadIcon("empty", KIcon::Toolbar, 32));
   m_pageIndex = pageIndex(page);
 
-  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()));
+  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent()));
   KoUnit::Unit unit = KoUnit::unit(Kivio::Config::unit());
   m_layout = Kivio::Config::defaultPageLayout();
   m_font = Kivio::Config::font();
@@ -158,8 +158,8 @@ void KivioOptionsDialog::initGrid()
   TQFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", KIcon::SizeMedium ));
   m_gridIndex = pageIndex(page);
 
-  KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()))->doc()->unit();
-  KivioGridData d = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()))->doc()->grid();
+  KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->unit();
+  KivioGridData d = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->grid();
   double pgw = m_layout.ptWidth;
   double pgh = m_layout.ptHeight;
   double fw = Kivio::Config::gridXSpacing();
@@ -210,7 +210,7 @@ void KivioOptionsDialog::initGrid()
 
 void KivioOptionsDialog::applyPage()
 {
-  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()));
+  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent()));
   view->doc()->setUnit(static_cast<KoUnit::Unit>(m_unitCombo->currentItem()));
   Kivio::Config::setUnit(KoUnit::unitName(view->doc()->unit()));
   Kivio::Config::setDefaultPageLayout(m_layout);
@@ -230,7 +230,7 @@ void KivioOptionsDialog::applyGrid()
   Kivio::Config::setShowGrid(m_gridChBox->isChecked());
   Kivio::Config::setSnapGrid(m_snapChBox->isChecked());
   Kivio::Config::setGridColor(m_gridColorBtn->color());
-  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()));
+  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent()));
   view->doc()->updateView(0);
 }
 
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h
index c15167480..589dab355 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.h
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.h
@@ -40,7 +40,7 @@ class TQFont;
 // class GuidesListViewItem : public KListViewItem
 // {
 //   public:
-//     GuidesListViewItem(TQListView* tqparent, KivioGuideLineData *gd, KoUnit::Unit u);
+//     GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u);
 //     ~GuidesListViewItem();
 // 
 //     void setUnit(KoUnit::Unit u);
@@ -59,7 +59,7 @@ class KivioOptionsDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    KivioOptionsDialog(KivioView* tqparent, const char* name = 0);
+    KivioOptionsDialog(KivioView* parent, const char* name = 0);
 
   protected:
     void initPage();
diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
index 359381de1..3361ad238 100644
--- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
@@ -32,8 +32,8 @@
 
 #include "kivio_view.h"
 
-KivioStencilFormatDlg::KivioStencilFormatDlg(KivioView* tqparent, const char* name)
-  : KDialogBase(tqparent, name, true, i18n("Stencil & Connector Format"), Ok|Cancel|Default, Ok)
+KivioStencilFormatDlg::KivioStencilFormatDlg(KivioView* parent, const char* name)
+  : KDialogBase(parent, name, true, i18n("Stencil & Connector Format"), Ok|Cancel|Default, Ok)
 {
   m_unit = KoUnit::U_PT;
   init();
@@ -83,7 +83,7 @@ void KivioStencilFormatDlg::init()
 
 void KivioStencilFormatDlg::initLinePatterns()
 {
-  TQBitmap tqmask;
+  TQBitmap mask;
   TQPixmap pix(m_patternCBox->width(), 17);
   TQPainter p(&pix, m_patternCBox);
   TQPen pen;
@@ -96,8 +96,8 @@ void KivioStencilFormatDlg::initLinePatterns()
     p.setPen(pen);
     p.drawLine(0, 8, pix.width(), 8);
 
-    tqmask = pix;
-    pix.setMask(tqmask);
+    mask = pix;
+    pix.setMask(mask);
     m_patternCBox->insertItem(pix, i);
   }
 
@@ -106,7 +106,7 @@ void KivioStencilFormatDlg::initLinePatterns()
 
 void KivioStencilFormatDlg::initFillPatterns()
 {
-  TQBitmap tqmask;
+  TQBitmap mask;
   TQPixmap pix(m_fillPatternCBox->width(), m_fillPatternCBox->fontMetrics().height() + 4);
   TQPainter p(&pix, m_fillPatternCBox);
   TQBrush brush;
@@ -126,7 +126,7 @@ void KivioStencilFormatDlg::initFillPatterns()
 
 void KivioStencilFormatDlg::initLineEndStyles()
 {
-  TQBitmap tqmask;
+  TQBitmap mask;
   TQPixmap pix(m_lineEndStyleCBox->width(), 17);
   TQPainter p(&pix, m_lineEndStyleCBox);
   TQPen pen;
@@ -142,8 +142,8 @@ void KivioStencilFormatDlg::initLineEndStyles()
     p.setPen(pen);
     p.drawLine(6, 8, pix.width() - 12, 8);
 
-    tqmask = pix;
-    pix.setMask(tqmask);
+    mask = pix;
+    pix.setMask(mask);
     m_lineEndStyleCBox->insertItem(pix, i);
   }
 
diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.h b/kivio/kiviopart/ui/kiviostencilformatdlg.h
index 6d45d4e23..358ddd20e 100644
--- a/kivio/kiviopart/ui/kiviostencilformatdlg.h
+++ b/kivio/kiviopart/ui/kiviostencilformatdlg.h
@@ -35,7 +35,7 @@ class KivioStencilFormatDlg : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    KivioStencilFormatDlg(KivioView* tqparent, const char* name = 0);
+    KivioStencilFormatDlg(KivioView* parent, const char* name = 0);
 
     double lineWidth();
     TQColor lineColor();
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
index 43f783e10..94dd995d0 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
@@ -31,8 +31,8 @@
 #include "kivio_view.h"
 #include "kivio_doc.h"
 
-KivioTextFormatDlg::KivioTextFormatDlg(KivioView* tqparent, const char* name)
-  : KDialogBase(Tabbed, i18n("Text Format"), Ok|Cancel|Default, Ok, tqparent, name)
+KivioTextFormatDlg::KivioTextFormatDlg(KivioView* parent, const char* name)
+  : KDialogBase(Tabbed, i18n("Text Format"), Ok|Cancel|Default, Ok, parent, name)
 {
   m_valign = TQt::AlignVCenter;
   m_halign = TQt::AlignHCenter;
@@ -183,7 +183,7 @@ void KivioTextFormatDlg::setTextColor(TQColor c)
 
 void KivioTextFormatDlg::slotDefault()
 {
-  setFont((static_cast<KivioView*>(TQT_TQWIDGET(tqparent())))->doc()->defaultFont());
+  setFont((static_cast<KivioView*>(TQT_TQWIDGET(parent())))->doc()->defaultFont());
   setTextColor(TQColor(0, 0, 0));
   setHAlign(TQt::AlignHCenter);
   setVAlign(TQt::AlignVCenter);
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.h b/kivio/kiviopart/ui/kiviotextformatdlg.h
index 6792f3f31..4bc8a5677 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.h
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.h
@@ -35,7 +35,7 @@ class KivioTextFormatDlg : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    KivioTextFormatDlg(KivioView* tqparent, const char* name = 0);
+    KivioTextFormatDlg(KivioView* parent, const char* name = 0);
 
     int valign();
     int halign();
diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp
index eabc8723b..ed32c284d 100644
--- a/kivio/kiviopart/ui/layerlisttooltip.cpp
+++ b/kivio/kiviopart/ui/layerlisttooltip.cpp
@@ -27,8 +27,8 @@
 
 namespace Kivio {
 
-LayerListToolTip::LayerListToolTip(TQWidget* tqparent, TQListView* listView)
- : TQToolTip(tqparent)
+LayerListToolTip::LayerListToolTip(TQWidget* parent, TQListView* listView)
+ : TQToolTip(parent)
 {
   m_listView = listView;
 }
diff --git a/kivio/kiviopart/ui/layerlisttooltip.h b/kivio/kiviopart/ui/layerlisttooltip.h
index 29bbabe64..f7c12037f 100644
--- a/kivio/kiviopart/ui/layerlisttooltip.h
+++ b/kivio/kiviopart/ui/layerlisttooltip.h
@@ -30,7 +30,7 @@ namespace Kivio {
 class LayerListToolTip : public TQToolTip
 {
   public:
-    LayerListToolTip(TQWidget* tqparent, TQListView* listView);
+    LayerListToolTip(TQWidget* parent, TQListView* listView);
     ~LayerListToolTip();
 
     void maybeTip(const TQPoint& pos);
diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp
index 28793807a..7483e98d3 100644
--- a/kivio/kiviopart/ui/objectlistpalette.cpp
+++ b/kivio/kiviopart/ui/objectlistpalette.cpp
@@ -40,8 +40,8 @@ namespace Kivio {
 class ObjectListItem : public KListViewItem
 {
   public:
-    ObjectListItem(KListView* tqparent, KivioStencil* _stencil)
-      : KListViewItem(tqparent, "")
+    ObjectListItem(KListView* parent, KivioStencil* _stencil)
+      : KListViewItem(parent, "")
     {
       m_stencil = _stencil;
       setPixmap(0, Kivio::generatePixmapFromStencil(22, 22, m_stencil));
@@ -80,8 +80,8 @@ class ObjectListItem : public KListViewItem
     KivioStencil* m_stencil;
 };
 
-ObjectListPalette::ObjectListPalette(KivioView* tqparent, const char* name)
-  : TQWidget(tqparent, name), m_view(tqparent)
+ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name)
+  : TQWidget(parent, name), m_view(parent)
 {
   m_blockUpdate = false;
 
diff --git a/kivio/kiviopart/ui/objectlistpalette.h b/kivio/kiviopart/ui/objectlistpalette.h
index 17fbd0f40..01db4ceb0 100644
--- a/kivio/kiviopart/ui/objectlistpalette.h
+++ b/kivio/kiviopart/ui/objectlistpalette.h
@@ -34,7 +34,7 @@ class ObjectListPalette : public TQWidget
   Q_OBJECT
   TQ_OBJECT
   public:
-    ObjectListPalette(KivioView* tqparent = 0, const char* name = 0);
+    ObjectListPalette(KivioView* parent = 0, const char* name = 0);
     ~ObjectListPalette();
 
     void updateObjectList();
diff --git a/kivio/plugins/kivioconnectortool/plugin.cpp b/kivio/plugins/kivioconnectortool/plugin.cpp
index 848579c95..8a61df936 100644
--- a/kivio/plugins/kivioconnectortool/plugin.cpp
+++ b/kivio/plugins/kivioconnectortool/plugin.cpp
@@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkivioconnectortool, ConnectorToolFactory )
 
 KInstance* ConnectorToolFactory::s_global = 0;
 
-ConnectorToolFactory::ConnectorToolFactory( TQObject* tqparent, const char* name )
-: KLibFactory( tqparent, name )
+ConnectorToolFactory::ConnectorToolFactory( TQObject* parent, const char* name )
+: KLibFactory( parent, name )
 {
   s_global = new KInstance("kivio");
 }
@@ -42,12 +42,12 @@ ConnectorToolFactory::~ConnectorToolFactory()
   delete s_global;
 }
 
-TQObject* ConnectorToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& )
+TQObject* ConnectorToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& )
 {
-  if ( !tqparent->inherits("KivioView") )
+  if ( !parent->inherits("KivioView") )
     return 0;
 
-  TQObject *obj = new ConnectorTool( (KivioView*)tqparent );
+  TQObject *obj = new ConnectorTool( (KivioView*)parent );
   return obj;
 }
 
diff --git a/kivio/plugins/kivioconnectortool/plugin.h b/kivio/plugins/kivioconnectortool/plugin.h
index e8d9803b9..267bbbb43 100644
--- a/kivio/plugins/kivioconnectortool/plugin.h
+++ b/kivio/plugins/kivioconnectortool/plugin.h
@@ -30,10 +30,10 @@ class ConnectorToolFactory : public KLibFactory
 { Q_OBJECT
   TQ_OBJECT
 public:
-  ConnectorToolFactory( TQObject* tqparent = 0, const char* name = 0 );
+  ConnectorToolFactory( TQObject* parent = 0, const char* name = 0 );
   ~ConnectorToolFactory();
 
-  virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0,
+  virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   static KInstance* global();
diff --git a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp
index 199e78d69..41ec75e0d 100644
--- a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp
+++ b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp
@@ -48,8 +48,8 @@ static KivioStencilSpawnerInfo sinfo = KivioStencilSpawnerInfo("Dave Marotti", "
 #include <kgenericfactory.h>
 K_EXPORT_COMPONENT_FACTORY( straight_connector, KGenericFactory<KivioConnectorFactory>( "KivioConnectorFactory" ) )
 
-KivioConnectorFactory::KivioConnectorFactory(TQObject *tqparent, const char* name, const TQStringList& args) :
-	KivioStencilFactory(tqparent, name, args)
+KivioConnectorFactory::KivioConnectorFactory(TQObject *parent, const char* name, const TQStringList& args) :
+	KivioStencilFactory(parent, name, args)
 {
 	kdDebug(43000) << "new straight line connector factory: " << endl;
 }
diff --git a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h
index e0ea74761..c9f1549ea 100644
--- a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h
+++ b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h
@@ -85,7 +85,7 @@ class KIVIOPLUGINS_EXPORT KivioConnectorFactory : public KivioStencilFactory
   Q_OBJECT
   TQ_OBJECT
   public:
-    KivioConnectorFactory(TQObject *tqparent=0, const char* name=0, const TQStringList& args = TQStringList());
+    KivioConnectorFactory(TQObject *parent=0, const char* name=0, const TQStringList& args = TQStringList());
     KivioStencil *NewStencil(const TQString& name);
     KivioStencil *NewStencil();
     TQPixmap *GetIcon();
diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp
index a1597f85e..ca3ff402b 100644
--- a/kivio/plugins/kivioconnectortool/tool_connector.cpp
+++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp
@@ -47,7 +47,7 @@
 #include "polylineconnectorspawner.h"
 #include "mousetoolaction.h"
 
-ConnectorTool::ConnectorTool( KivioView* tqparent ) : Kivio::MouseTool(tqparent, "Connector Mouse Tool")
+ConnectorTool::ConnectorTool( KivioView* parent ) : Kivio::MouseTool(parent, "Connector Mouse Tool")
 {
   m_connectorAction = new Kivio::MouseToolAction(i18n("Straight Connector"), "kivio_connector", 0,
     actionCollection(), "connector");
diff --git a/kivio/plugins/kivioconnectortool/tool_connector.h b/kivio/plugins/kivioconnectortool/tool_connector.h
index 7dd1462b2..744970538 100644
--- a/kivio/plugins/kivioconnectortool/tool_connector.h
+++ b/kivio/plugins/kivioconnectortool/tool_connector.h
@@ -40,7 +40,7 @@ class ConnectorTool : public Kivio::MouseTool
   Q_OBJECT
   TQ_OBJECT
   public:
-    ConnectorTool( KivioView* tqparent );
+    ConnectorTool( KivioView* parent );
     ~ConnectorTool();
 
     virtual bool processEvent(TQEvent* e);
diff --git a/kivio/plugins/kivioselecttool/plugin.cpp b/kivio/plugins/kivioselecttool/plugin.cpp
index c6d22e643..fba217c6c 100644
--- a/kivio/plugins/kivioselecttool/plugin.cpp
+++ b/kivio/plugins/kivioselecttool/plugin.cpp
@@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkivioselecttool, SelectToolFactory )
 
 KInstance* SelectToolFactory::s_global = 0;
 
-SelectToolFactory::SelectToolFactory( TQObject* tqparent, const char* name )
-: KLibFactory( tqparent, name )
+SelectToolFactory::SelectToolFactory( TQObject* parent, const char* name )
+: KLibFactory( parent, name )
 {
   s_global = new KInstance("kivio");
 }
@@ -42,12 +42,12 @@ SelectToolFactory::~SelectToolFactory()
   delete s_global;
 }
 
-TQObject* SelectToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& )
+TQObject* SelectToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& )
 {
-  if ( !tqparent->inherits("KivioView") )
+  if ( !parent->inherits("KivioView") )
     return 0;
 
-  TQObject *obj = new SelectTool( (KivioView*)tqparent );
+  TQObject *obj = new SelectTool( (KivioView*)parent );
   return obj;
 }
 
diff --git a/kivio/plugins/kivioselecttool/plugin.h b/kivio/plugins/kivioselecttool/plugin.h
index dffe41618..5564327ff 100644
--- a/kivio/plugins/kivioselecttool/plugin.h
+++ b/kivio/plugins/kivioselecttool/plugin.h
@@ -30,10 +30,10 @@ class SelectToolFactory : public KLibFactory
 { Q_OBJECT
   TQ_OBJECT
 public:
-  SelectToolFactory( TQObject* tqparent = 0, const char* name = 0 );
+  SelectToolFactory( TQObject* parent = 0, const char* name = 0 );
   ~SelectToolFactory();
 
-  virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0,
+  virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   static KInstance* global();
diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp
index b201f4d42..b6c24c579 100644
--- a/kivio/plugins/kivioselecttool/tool_select.cpp
+++ b/kivio/plugins/kivioselecttool/tool_select.cpp
@@ -48,7 +48,7 @@
 
 #include "kivio_pluginmanager.h"
 
-SelectTool::SelectTool( KivioView* tqparent ) : Kivio::MouseTool(tqparent, "Selection Mouse Tool")
+SelectTool::SelectTool( KivioView* parent ) : Kivio::MouseTool(parent, "Selection Mouse Tool")
 {
   view()->pluginManager()->setDefaultTool(this);
 
diff --git a/kivio/plugins/kivioselecttool/tool_select.h b/kivio/plugins/kivioselecttool/tool_select.h
index 6e476b998..7a71dabf0 100644
--- a/kivio/plugins/kivioselecttool/tool_select.h
+++ b/kivio/plugins/kivioselecttool/tool_select.h
@@ -56,7 +56,7 @@ class SelectTool : public Kivio::MouseTool
   Q_OBJECT
   TQ_OBJECT
   public:
-    SelectTool( KivioView* tqparent );
+    SelectTool( KivioView* parent );
     ~SelectTool();
 
     virtual bool processEvent(TQEvent* e);
diff --git a/kivio/plugins/kiviosmlconnector/plugin.cpp b/kivio/plugins/kiviosmlconnector/plugin.cpp
index a622f6e3a..5c4b74f7b 100644
--- a/kivio/plugins/kiviosmlconnector/plugin.cpp
+++ b/kivio/plugins/kiviosmlconnector/plugin.cpp
@@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkiviosmlconnector, SMLConnectorFactory )
 
 KInstance* SMLConnectorFactory::s_global = 0;
 
-SMLConnectorFactory::SMLConnectorFactory( TQObject* tqparent, const char* name )
-: KLibFactory( tqparent, name )
+SMLConnectorFactory::SMLConnectorFactory( TQObject* parent, const char* name )
+: KLibFactory( parent, name )
 {
   s_global = new KInstance("kivio");
 }
@@ -42,12 +42,12 @@ SMLConnectorFactory::~SMLConnectorFactory()
   delete s_global;
 }
 
-TQObject* SMLConnectorFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& )
+TQObject* SMLConnectorFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& )
 {
-  if ( !tqparent->inherits("KivioView") )
+  if ( !parent->inherits("KivioView") )
     return 0;
 
-  TQObject *obj = new SMLConnector( (KivioView*)tqparent );
+  TQObject *obj = new SMLConnector( (KivioView*)parent );
   return obj;
 }
 
diff --git a/kivio/plugins/kiviosmlconnector/plugin.h b/kivio/plugins/kiviosmlconnector/plugin.h
index 9868fcc09..0a1f90566 100644
--- a/kivio/plugins/kiviosmlconnector/plugin.h
+++ b/kivio/plugins/kiviosmlconnector/plugin.h
@@ -30,10 +30,10 @@ class SMLConnectorFactory : public KLibFactory
 { Q_OBJECT
   TQ_OBJECT
 public:
-  SMLConnectorFactory( TQObject* tqparent = 0, const char* name = 0 );
+  SMLConnectorFactory( TQObject* parent = 0, const char* name = 0 );
   ~SMLConnectorFactory();
 
-  virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0,
+  virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   static KInstance* global();
diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp
index 3ab38fa48..3745820c3 100644
--- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp
+++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp
@@ -48,8 +48,8 @@ static KivioStencilSpawnerInfo sinfo = KivioStencilSpawnerInfo( "Ian Reinhart Ge
 
 K_EXPORT_COMPONENT_FACTORY( sml_connector, KGenericFactory<KivioSMLConnectorFactory>( "KivioSMLConnectorFactory" ) )
 
-KivioSMLConnectorFactory::KivioSMLConnectorFactory( TQObject *tqparent, const char* name, const TQStringList& args ) :
-		KivioStencilFactory( tqparent, name, args )
+KivioSMLConnectorFactory::KivioSMLConnectorFactory( TQObject *parent, const char* name, const TQStringList& args ) :
+		KivioStencilFactory( parent, name, args )
 {
 	kdDebug(43000) << "new sml stencil factory: " << endl;
 }
diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h
index 0be46d460..a50ec7505 100644
--- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h
+++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h
@@ -95,7 +95,7 @@ class KivioSMLConnectorFactory : public KivioStencilFactory
 	Q_OBJECT
   TQ_OBJECT
     public:
-    	KivioSMLConnectorFactory(TQObject *tqparent=0, const char* name=0, const TQStringList& args = TQStringList());
+    	KivioSMLConnectorFactory(TQObject *parent=0, const char* name=0, const TQStringList& args = TQStringList());
 	KivioStencil *NewStencil(const TQString& name);
 	KivioStencil *NewStencil();
     	TQPixmap *GetIcon();
diff --git a/kivio/plugins/kiviotargettool/kiviotargettool.cpp b/kivio/plugins/kiviotargettool/kiviotargettool.cpp
index 672c0a439..c25fb36bd 100644
--- a/kivio/plugins/kiviotargettool/kiviotargettool.cpp
+++ b/kivio/plugins/kiviotargettool/kiviotargettool.cpp
@@ -32,7 +32,7 @@
 #include "kivio_command.h"
 
 namespace Kivio {
-  TargetTool::TargetTool(KivioView* tqparent) : MouseTool(tqparent, "Add Target Mouse Tool")
+  TargetTool::TargetTool(KivioView* parent) : MouseTool(parent, "Add Target Mouse Tool")
   {
     m_targetAction = new Kivio::MouseToolAction(i18n("Add Connector Target"),
         "add_target", 0, actionCollection(), "addTargetTool");
diff --git a/kivio/plugins/kiviotargettool/kiviotargettool.h b/kivio/plugins/kiviotargettool/kiviotargettool.h
index 52286f822..064c4f05d 100644
--- a/kivio/plugins/kiviotargettool/kiviotargettool.h
+++ b/kivio/plugins/kiviotargettool/kiviotargettool.h
@@ -38,7 +38,7 @@ namespace Kivio {
     Q_OBJECT
   TQ_OBJECT
     public:
-      TargetTool(KivioView* tqparent);
+      TargetTool(KivioView* parent);
       ~TargetTool();
   
       virtual bool processEvent(TQEvent* e);
diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp
index 599c3a013..048c8e328 100644
--- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp
+++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp
@@ -24,8 +24,8 @@ K_EXPORT_COMPONENT_FACTORY( libkiviotargettool, KivioTargetToolFactory )
 
 KInstance* KivioTargetToolFactory::s_global = 0;
 
-KivioTargetToolFactory::KivioTargetToolFactory(TQObject *tqparent, const char *name)
- : KLibFactory(tqparent, name)
+KivioTargetToolFactory::KivioTargetToolFactory(TQObject *parent, const char *name)
+ : KLibFactory(parent, name)
 {
   s_global = new KInstance("kivio");
 }
@@ -35,12 +35,12 @@ KivioTargetToolFactory::~KivioTargetToolFactory()
   delete s_global;
 }
 
-TQObject* KivioTargetToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& )
+TQObject* KivioTargetToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& )
 {
-  if ( !tqparent->inherits("KivioView") )
+  if ( !parent->inherits("KivioView") )
     return 0;
 
-  TQObject *obj = new Kivio::TargetTool(static_cast<KivioView*>(TQT_TQWIDGET(tqparent)));
+  TQObject *obj = new Kivio::TargetTool(static_cast<KivioView*>(TQT_TQWIDGET(parent)));
   return obj;
 }
 
diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
index e1ba45216..84619e47b 100644
--- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
+++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
@@ -31,10 +31,10 @@ class KivioTargetToolFactory : public KLibFactory
   Q_OBJECT
   TQ_OBJECT
   public:
-    KivioTargetToolFactory(TQObject *tqparent = 0, const char *name = 0);
+    KivioTargetToolFactory(TQObject *parent = 0, const char *name = 0);
     ~KivioTargetToolFactory();
 
-    virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0,
+    virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                             const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
   
     static KInstance* global();
diff --git a/kivio/plugins/kiviotexttool/plugin.cpp b/kivio/plugins/kiviotexttool/plugin.cpp
index cd9a43eca..fd1739356 100644
--- a/kivio/plugins/kiviotexttool/plugin.cpp
+++ b/kivio/plugins/kiviotexttool/plugin.cpp
@@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkiviotexttool, TextToolFactory )
 
 KInstance* TextToolFactory::s_global = 0;
 
-TextToolFactory::TextToolFactory( TQObject* tqparent, const char* name )
-: KLibFactory( tqparent, name )
+TextToolFactory::TextToolFactory( TQObject* parent, const char* name )
+: KLibFactory( parent, name )
 {
   s_global = new KInstance("kivio");
 }
@@ -42,12 +42,12 @@ TextToolFactory::~TextToolFactory()
   delete s_global;
 }
 
-TQObject* TextToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& )
+TQObject* TextToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& )
 {
-  if ( !tqparent->inherits("KivioView") )
+  if ( !parent->inherits("KivioView") )
     return 0;
 
-  TQObject *obj = new TextTool( (KivioView*)tqparent );
+  TQObject *obj = new TextTool( (KivioView*)parent );
   return obj;
 }
 
diff --git a/kivio/plugins/kiviotexttool/plugin.h b/kivio/plugins/kiviotexttool/plugin.h
index 1e30ddb01..f6194c14d 100644
--- a/kivio/plugins/kiviotexttool/plugin.h
+++ b/kivio/plugins/kiviotexttool/plugin.h
@@ -30,10 +30,10 @@ class TextToolFactory : public KLibFactory
 { Q_OBJECT
   TQ_OBJECT
 public:
-  TextToolFactory( TQObject* tqparent = 0, const char* name = 0 );
+  TextToolFactory( TQObject* parent = 0, const char* name = 0 );
   ~TextToolFactory();
 
-  virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0,
+  virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   static KInstance* global();
diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
index a68b9548f..49a42589b 100644
--- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
+++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
@@ -35,8 +35,8 @@
 
 namespace Kivio {
 
-StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *tqparent, const char *name)
-  : KDialogBase(tqparent, name, true, caption, KDialogBase::Ok|KDialogBase::Cancel)
+StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *parent, const char *name)
+  : KDialogBase(parent, name, true, caption, KDialogBase::Ok|KDialogBase::Cancel)
 {
   m_hAlign = -1;
   m_vAlign = -1;
diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.h b/kivio/plugins/kiviotexttool/stenciltexteditor.h
index d57cb9dd5..7f61c5aaa 100644
--- a/kivio/plugins/kiviotexttool/stenciltexteditor.h
+++ b/kivio/plugins/kiviotexttool/stenciltexteditor.h
@@ -36,7 +36,7 @@ class StencilTextEditor : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    StencilTextEditor(const TQString& caption, TQWidget *tqparent = 0, const char *name = 0);
+    StencilTextEditor(const TQString& caption, TQWidget *parent = 0, const char *name = 0);
     ~StencilTextEditor();
 
     void setFont(const TQFont& font);
diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp
index 645a79a42..7d449ae07 100644
--- a/kivio/plugins/kiviotexttool/tool_text.cpp
+++ b/kivio/plugins/kiviotexttool/tool_text.cpp
@@ -46,7 +46,7 @@
 #include "stenciltexteditor.h"
 
 
-TextTool::TextTool( KivioView* tqparent ) : Kivio::MouseTool(tqparent, "Text Mouse Tool")
+TextTool::TextTool( KivioView* parent ) : Kivio::MouseTool(parent, "Text Mouse Tool")
 {
   m_textAction = new Kivio::MouseToolAction( i18n("Text Tool"), "text", Key_F2, actionCollection(), "text" );
   connect(m_textAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool)));
diff --git a/kivio/plugins/kiviotexttool/tool_text.h b/kivio/plugins/kiviotexttool/tool_text.h
index 1bc43bb92..f6c4870a7 100644
--- a/kivio/plugins/kiviotexttool/tool_text.h
+++ b/kivio/plugins/kiviotexttool/tool_text.h
@@ -38,7 +38,7 @@ class KIVIO_EXPORT TextTool : public Kivio::MouseTool
   Q_OBJECT
   TQ_OBJECT
   public:
-    TextTool( KivioView* tqparent );
+    TextTool( KivioView* parent );
     ~TextTool();
   
     virtual bool processEvent(TQEvent* e);
diff --git a/kivio/plugins/kiviozoomtool/plugin.cpp b/kivio/plugins/kiviozoomtool/plugin.cpp
index 6248e4321..4ecd452df 100644
--- a/kivio/plugins/kiviozoomtool/plugin.cpp
+++ b/kivio/plugins/kiviozoomtool/plugin.cpp
@@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkiviozoomtool, ZoomToolFactory )
 
 KInstance* ZoomToolFactory::s_global = 0;
 
-ZoomToolFactory::ZoomToolFactory( TQObject* tqparent, const char* name )
-: KLibFactory( tqparent, name )
+ZoomToolFactory::ZoomToolFactory( TQObject* parent, const char* name )
+: KLibFactory( parent, name )
 {
   s_global = new KInstance("kivio");
 }
@@ -42,12 +42,12 @@ ZoomToolFactory::~ZoomToolFactory()
   delete s_global;
 }
 
-TQObject* ZoomToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& )
+TQObject* ZoomToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& )
 {
-  if ( !tqparent->inherits("KivioView") )
+  if ( !parent->inherits("KivioView") )
     return 0;
 
-  TQObject* obj = new ZoomTool( (KivioView*)tqparent );
+  TQObject* obj = new ZoomTool( (KivioView*)parent );
   return obj;
 }
 
diff --git a/kivio/plugins/kiviozoomtool/plugin.h b/kivio/plugins/kiviozoomtool/plugin.h
index 42ceb0914..0bdfde140 100644
--- a/kivio/plugins/kiviozoomtool/plugin.h
+++ b/kivio/plugins/kiviozoomtool/plugin.h
@@ -30,10 +30,10 @@ class ZoomToolFactory : public KLibFactory
 { Q_OBJECT
   TQ_OBJECT
 public:
-  ZoomToolFactory( TQObject* tqparent = 0, const char* name = 0 );
+  ZoomToolFactory( TQObject* parent = 0, const char* name = 0 );
   ~ZoomToolFactory();
 
-  virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0,
+  virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
   static KInstance* global();
 
diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp
index f690c9f3c..01a148be2 100644
--- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp
+++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp
@@ -38,7 +38,7 @@
 #include <tqapplication.h>
 #include <tqcursor.h>
 
-ZoomTool::ZoomTool(KivioView* tqparent) : Kivio::MouseTool(tqparent, "Zoom Mouse Tool")
+ZoomTool::ZoomTool(KivioView* parent) : Kivio::MouseTool(parent, "Zoom Mouse Tool")
 {
   m_zoomAction = new KRadioAction(i18n("&Zoom"), "viewmag", CTRL + ALT + Key_Z, actionCollection(), "zoom");
   m_zoomAction->setWhatsThis(i18n("By pressing this button you can zoom in on a specific area."));
@@ -53,8 +53,8 @@ ZoomTool::ZoomTool(KivioView* tqparent) : Kivio::MouseTool(tqparent, "Zoom Mouse
 
   KoZoomAction* viewZoom = new KoZoomAction(i18n("Zoom &Level"), "viewmag", 0, actionCollection(), "viewZoom" );
   viewZoom->setWhatsThis(i18n("This allows you to zoom in or out of a document. You can either choose one of the predefined zoomfactors or enter a new zoomfactor (in percent)."));
-  connect(viewZoom, TQT_SIGNAL(zoomChanged(const TQString&)), tqparent, TQT_SLOT(viewZoom(const TQString&)));
-  connect(tqparent, TQT_SIGNAL(zoomChanged(int)), viewZoom, TQT_SLOT(setZoom(int)));
+  connect(viewZoom, TQT_SIGNAL(zoomChanged(const TQString&)), parent, TQT_SLOT(viewZoom(const TQString&)));
+  connect(parent, TQT_SIGNAL(zoomChanged(int)), viewZoom, TQT_SLOT(setZoom(int)));
   
   m_pPlus = KStdAction::zoomIn(this, TQT_SLOT(zoomPlus()), actionCollection(), "zoomPlus");
   m_pPlus->setWhatsThis(i18n("You can zoom in on the document by pressing this button."));
diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.h b/kivio/plugins/kiviozoomtool/tool_zoom.h
index 15700f753..1cb77431e 100644
--- a/kivio/plugins/kiviozoomtool/tool_zoom.h
+++ b/kivio/plugins/kiviozoomtool/tool_zoom.h
@@ -36,7 +36,7 @@ class ZoomTool : public Kivio::MouseTool
   Q_OBJECT
   TQ_OBJECT
   public:
-    ZoomTool(KivioView* tqparent);
+    ZoomTool(KivioView* parent);
     virtual ~ZoomTool();
   
     virtual bool processEvent(TQEvent* e);
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp
index d8d5550f3..93bbb6c42 100644
--- a/koshell/iconsidepane.cpp
+++ b/koshell/iconsidepane.cpp
@@ -44,8 +44,8 @@
 
 #include "iconsidepane.h"
 
-EntryItem::EntryItem( Navigator *tqparent, int _id, const TQString &_text, const TQString & _pix )
-  : TQListBoxItem( tqparent ),
+EntryItem::EntryItem( Navigator *parent, int _id, const TQString &_text, const TQString & _pix )
+  : TQListBoxItem( parent ),
     mPixmapName(_pix),
     mId(_id),
     mHasHover( false ),
@@ -203,8 +203,8 @@ void EntryItem::setPaintActive( bool paintActive )
 
 // ************************************************
 
-Navigator::Navigator(bool _selectable, KPopupMenu * menu, IconSidePane *_iconsidepane, TQWidget *tqparent, const char *name )
-  : KListBox( tqparent, name ), mSidePane( _iconsidepane ), mPopupMenu( menu )
+Navigator::Navigator(bool _selectable, KPopupMenu * menu, IconSidePane *_iconsidepane, TQWidget *parent, const char *name )
+  : KListBox( parent, name ), mSidePane( _iconsidepane ), mPopupMenu( menu )
 {
   setSelectionMode( KListBox::Single );
   viewport()->setBackgroundMode( PaletteBackground );
@@ -402,8 +402,8 @@ void Navigator::slotShowRMBMenu( TQListBoxItem *, const TQPoint &pos )
 
 // ************************************************
 
-IconSidePane::IconSidePane(TQWidget *tqparent, const char *name )
-  : TQVBox( tqparent, name )
+IconSidePane::IconSidePane(TQWidget *parent, const char *name )
+  : TQVBox( parent, name )
 {
   m_buttongroup = new TQButtonGroup(1, Qt::Horizontal, this);
   m_buttongroup->setExclusive(true);
diff --git a/koshell/iconsidepane.h b/koshell/iconsidepane.h
index 3838967ab..e0c4f7f03 100644
--- a/koshell/iconsidepane.h
+++ b/koshell/iconsidepane.h
@@ -90,8 +90,8 @@ class EntryItem : public TQListBoxItem
 class EntryItemToolTip : public TQToolTip
 {
   public:
-    EntryItemToolTip( TQListBox* tqparent )
-      : TQToolTip( tqparent->viewport() ), mListBox( tqparent ) 
+    EntryItemToolTip( TQListBox* parent )
+      : TQToolTip( parent->viewport() ), mListBox( parent ) 
       {}
   protected:
     void maybeTip( const TQPoint& p ) {
@@ -119,7 +119,7 @@ class Navigator : public KListBox
     Q_OBJECT
   TQ_OBJECT
   public:
-    Navigator(bool _selectable, KPopupMenu*, IconSidePane *, TQWidget *tqparent = 0, const char *name = 0 );
+    Navigator(bool _selectable, KPopupMenu*, IconSidePane *, TQWidget *parent = 0, const char *name = 0 );
 
     int insertItem(const TQString &_text, const TQString &_pix);
 
@@ -166,7 +166,7 @@ class IconSidePane :public TQVBox
     Q_OBJECT
   TQ_OBJECT
   public:
-    IconSidePane( TQWidget *tqparent, const char *name = 0 );
+    IconSidePane( TQWidget *parent, const char *name = 0 );
     ~IconSidePane();
 
     void setActionCollection( KActionCollection *actionCollection );
diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc
index 181fd88b9..be7b2af93 100644
--- a/koshell/koshell_shell.cc
+++ b/koshell/koshell_shell.cc
@@ -143,7 +143,7 @@ KoShellWindow::~KoShellWindow()
   }
   m_lstPages.clear();
 
-  setRootDocumentDirect( 0L, TQPtrList<KoView>() ); // prevent our tqparent destructor from doing stupid things
+  setRootDocumentDirect( 0L, TQPtrList<KoView>() ); // prevent our parent destructor from doing stupid things
   saveSettings(); // Now save our settings before exiting
 }
 
diff --git a/kounavail/kounavail.cc b/kounavail/kounavail.cc
index 1f1743afc..364a8e846 100644
--- a/kounavail/kounavail.cc
+++ b/kounavail/kounavail.cc
@@ -30,15 +30,15 @@
 #include <kglobalsettings.h>
 #include <tqapplication.h>
 
-KoUnavailPart::KoUnavailPart( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name )
-    : KoDocument( parentWidget, widgetName, tqparent, name, false /*singleViewMode*/ )
+KoUnavailPart::KoUnavailPart( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name )
+    : KoDocument( parentWidget, widgetName, parent, name, false /*singleViewMode*/ )
 {
     setReadWrite( false );
 }
 
-KoView* KoUnavailPart::createViewInstance( TQWidget* tqparent, const char* name )
+KoView* KoUnavailPart::createViewInstance( TQWidget* parent, const char* name )
 {
-    return new KoUnavailView( this, tqparent, name );
+    return new KoUnavailView( this, parent, name );
 }
 
 bool KoUnavailPart::loadOasis( const TQDomDocument& doc, KoOasisStyles&, const TQDomDocument&, KoStore* )
@@ -105,8 +105,8 @@ void KoUnavailPart::paintContent( TQPainter& painter, const TQRect& rect, bool /
     painter.restore();
 }
 
-KoUnavailView::KoUnavailView( KoUnavailPart* part, TQWidget* tqparent, const char* name )
-    : KoView( part, tqparent, name )
+KoUnavailView::KoUnavailView( KoUnavailPart* part, TQWidget* parent, const char* name )
+    : KoView( part, parent, name )
 {
     setInstance( KoUnavailFactory::global() );
     //setXMLFile( "kounavail.rc" );
@@ -130,8 +130,8 @@ K_EXPORT_COMPONENT_FACTORY( libkounavailpart, KoUnavailFactory )
 KInstance* KoUnavailFactory::s_global = 0L;
 KAboutData* KoUnavailFactory::s_aboutData = 0L;
 
-KoUnavailFactory::KoUnavailFactory( TQObject* tqparent, const char* name )
-    : KoFactory( tqparent, name )
+KoUnavailFactory::KoUnavailFactory( TQObject* parent, const char* name )
+    : KoFactory( parent, name )
 {
     global();
 }
@@ -144,9 +144,9 @@ KoUnavailFactory::~KoUnavailFactory()
     s_global = 0L;
 }
 
-KParts::Part* KoUnavailFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char*, const TQStringList & )
+KParts::Part* KoUnavailFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char*, const TQStringList & )
 {
-    return new KoUnavailPart( parentWidget, widgetName, tqparent, name );
+    return new KoUnavailPart( parentWidget, widgetName, parent, name );
 }
 
 KAboutData* KoUnavailFactory::aboutData()
diff --git a/kounavail/kounavail.h b/kounavail/kounavail.h
index 41d2f77fb..8f331a6be 100644
--- a/kounavail/kounavail.h
+++ b/kounavail/kounavail.h
@@ -30,7 +30,7 @@ class KoUnavailPart : public KoDocument
     TQ_PROPERTY( TQString unavailReason READ unavailReason WRITE setUnavailReason )
     TQ_PROPERTY( TQString realURL READ realURL WRITE setRealURL )
 public:
-    KoUnavailPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0 );
+    KoUnavailPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0 );
 
     virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 );
 
@@ -62,7 +62,7 @@ public:
     TQString realURL() const { return m_url.url(); }
 
 protected:
-    virtual KoView* createViewInstance( TQWidget* tqparent, const char* name );
+    virtual KoView* createViewInstance( TQWidget* parent, const char* name );
 
     TQDomDocument m_doc;
     TQCString m_mimetype;
@@ -76,7 +76,7 @@ class KoUnavailView : public KoView
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnavailView( KoUnavailPart* part, TQWidget* tqparent = 0, const char* name = 0 );
+    KoUnavailView( KoUnavailPart* part, TQWidget* parent = 0, const char* name = 0 );
 
 protected:
     virtual void paintEvent( TQPaintEvent* );
@@ -93,10 +93,10 @@ class KoUnavailFactory : public KoFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnavailFactory( TQObject* tqparent = 0, const char* name = 0 );
+    KoUnavailFactory( TQObject* parent = 0, const char* name = 0 );
     ~KoUnavailFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/kplato/intervalitem.h b/kplato/intervalitem.h
index 2ee6b4c60..4e0cb7046 100644
--- a/kplato/intervalitem.h
+++ b/kplato/intervalitem.h
@@ -30,8 +30,8 @@ namespace KPlato
 class IntervalItem : public TQListViewItem
 {
 public:
-    IntervalItem(TQListView * tqparent, TQTime start, TQTime end)
-    : TQListViewItem(tqparent, TQString("%1  -  %2").tqarg(start.toString(), end.toString())),
+    IntervalItem(TQListView * parent, TQTime start, TQTime end)
+    : TQListViewItem(parent, TQString("%1  -  %2").tqarg(start.toString(), end.toString())),
       m_start(start),
       m_end(end)
     {}
diff --git a/kplato/kptaccount.cc b/kplato/kptaccount.cc
index 074189d34..4c4571936 100644
--- a/kplato/kptaccount.cc
+++ b/kplato/kptaccount.cc
@@ -95,10 +95,10 @@ void Account::take(Account *account) {
     if (account == 0) {
         return;
     }
-    if (account->tqparent() == this) {
+    if (account->parent() == this) {
         m_accountList.take(m_accountList.findRef(account));
-    } else if (account->tqparent()) {
-        account->tqparent()->take(account);
+    } else if (account->parent()) {
+        account->parent()->take(account);
     } else {
         m_list->take(account);
     }
@@ -383,8 +383,8 @@ void Accounts::take(Account *account){
         return;
     }
     removeId(account->name());
-    if (account->tqparent()) {
-        account->tqparent()->take(account);
+    if (account->parent()) {
+        account->parent()->take(account);
         return;
     }
     m_accountList.take(m_accountList.findRef(account));
diff --git a/kplato/kptaccount.h b/kplato/kptaccount.h
index 9e23b8e7b..61ecf72db 100644
--- a/kplato/kptaccount.h
+++ b/kplato/kptaccount.h
@@ -75,8 +75,8 @@ public:
     
     Accounts *list() const { return m_list; }
     void setList(Accounts *list) { m_list = list; }
-    Account *tqparent() const { return m_parent; }
-    void setParent(Account *tqparent) { m_parent = tqparent; }
+    Account *parent() const { return m_parent; }
+    void setParent(Account *parent) { m_parent = parent; }
     void clear() { m_accountList.clear(); }
     void append(Account *account);
     void take(Account *account);
diff --git a/kplato/kptaccountsdialog.h b/kplato/kptaccountsdialog.h
index e9bb8d4ed..e281f2df8 100644
--- a/kplato/kptaccountsdialog.h
+++ b/kplato/kptaccountsdialog.h
@@ -37,7 +37,7 @@ class AccountsDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    AccountsDialog(Accounts &acc, TQWidget *tqparent=0, const char *name=0);
+    AccountsDialog(Accounts &acc, TQWidget *parent=0, const char *name=0);
 
     KCommand *buildCommand(Part *part);
 
diff --git a/kplato/kptaccountspanel.cc b/kplato/kptaccountspanel.cc
index a27bd908d..b5082af0d 100644
--- a/kplato/kptaccountspanel.cc
+++ b/kplato/kptaccountspanel.cc
@@ -39,23 +39,23 @@ namespace KPlato
 
 class AccountItem : public KListViewItem {
 public:
-    AccountItem(AccountsPanel &pan, TQListView *tqparent)
-    : KListViewItem(tqparent), account(0), panel(pan)
+    AccountItem(AccountsPanel &pan, TQListView *parent)
+    : KListViewItem(parent), account(0), panel(pan)
     { init(); }
-    AccountItem(AccountsPanel &pan, TQListViewItem *tqparent)
-    : KListViewItem(tqparent), account(0), panel(pan)
+    AccountItem(AccountsPanel &pan, TQListViewItem *parent)
+    : KListViewItem(parent), account(0), panel(pan)
     { init(); }
-    AccountItem(AccountsPanel &pan, TQListView *tqparent, TQString label1, TQString label2 = TQString())
-    : KListViewItem(tqparent, label1, label2), account(0), panel(pan)
+    AccountItem(AccountsPanel &pan, TQListView *parent, TQString label1, TQString label2 = TQString())
+    : KListViewItem(parent, label1, label2), account(0), panel(pan)
     { init(); }
-    AccountItem(AccountsPanel &pan, TQListViewItem *tqparent, TQString label1, TQString label2 = TQString())
-    : KListViewItem(tqparent, label1, label2), account(0), panel(pan)
+    AccountItem(AccountsPanel &pan, TQListViewItem *parent, TQString label1, TQString label2 = TQString())
+    : KListViewItem(parent, label1, label2), account(0), panel(pan)
     { init(); }
-    AccountItem(AccountsPanel &pan, TQListView *tqparent, TQListViewItem *after)
-    : KListViewItem(tqparent, after), account(0), panel(pan)
+    AccountItem(AccountsPanel &pan, TQListView *parent, TQListViewItem *after)
+    : KListViewItem(parent, after), account(0), panel(pan)
     { init(); }
-    AccountItem(AccountsPanel &pan, TQListViewItem *tqparent, TQListViewItem *after)
-    : KListViewItem(tqparent, after), account(0), panel(pan)
+    AccountItem(AccountsPanel &pan, TQListViewItem *parent, TQListViewItem *after)
+    : KListViewItem(parent, after), account(0), panel(pan)
     { init(); }
 
     Account *account;
@@ -148,8 +148,8 @@ void AccountsPanel::addItems(TQListViewItem *item, Account *acc) {
 }
 
 void AccountsPanel::addElement(const TQListViewItem *item) {
-    if (item->tqparent()) {
-        removeElement(item->tqparent());
+    if (item->parent()) {
+        removeElement(item->parent());
     }
     m_elements.replace(item->text(0), item);
     //kdDebug()<<k_funcinfo<<item->text(0)<<endl;
@@ -277,8 +277,8 @@ void AccountsPanel::slotNewBtn() {
     }
     TQListViewItem *n;
     if (item) {
-        if (item->tqparent()) {
-            n = new AccountItem(*this, item->tqparent(), item);
+        if (item->parent()) {
+            n = new AccountItem(*this, item->parent(), item);
         } else {
             n = new AccountItem(*this, accountList, item);
         }
@@ -344,9 +344,9 @@ KCommand *AccountsPanel::save(Part *part, Project &project, TQListViewItem *i) {
             //kdDebug()<<k_funcinfo<<"New account: "<<item->text(0)<<endl;
             if (!cmd) cmd = new KMacroCommand("");
             item->account = new Account(item->text(0), item->text(1));
-            if (item->tqparent()) {
+            if (item->parent()) {
                 //kdDebug()<<k_funcinfo<<"New account: "<<item->text(0)<<endl;
-                cmd->addCommand(new AddAccountCmd(part, project, item->account, item->tqparent()->text(0)));
+                cmd->addCommand(new AddAccountCmd(part, project, item->account, item->parent()->text(0)));
             } else {
                 cmd->addCommand(new AddAccountCmd(part, project, item->account));
             }
@@ -415,7 +415,7 @@ void AccountsPanel::slotRemoveItem(TQListViewItem *i) {
         return;
     //kdDebug()<<k_funcinfo<<item->text(0)<<endl;
     removeElement(item);
-    TQListViewItem *p = item->tqparent();
+    TQListViewItem *p = item->parent();
     if (p) {
         p->takeItem(item);
         if (item->account) {
diff --git a/kplato/kptaccountspanel.h b/kplato/kptaccountspanel.h
index 6e1646f79..069515cb0 100644
--- a/kplato/kptaccountspanel.h
+++ b/kplato/kptaccountspanel.h
@@ -45,7 +45,7 @@ class AccountsPanel : public AccountsPanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    AccountsPanel(Accounts &acc, TQWidget *tqparent=0, const char *name=0);
+    AccountsPanel(Accounts &acc, TQWidget *parent=0, const char *name=0);
     
     KCommand *buildCommand(Part *part);
     
diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc
index d9e0c33de..9825d9c23 100644
--- a/kplato/kptaccountsview.cc
+++ b/kplato/kptaccountsview.cc
@@ -64,10 +64,10 @@ public:
     }
 };
 
-AccountsView::AccountItem::AccountItem(Account *a, TQListView *tqparent, bool highlight)
-    : DoubleListViewBase::MasterListItem(tqparent, a->name(), highlight),
+AccountsView::AccountItem::AccountItem(Account *a, TQListView *parent, bool highlight)
+    : DoubleListViewBase::MasterListItem(parent, a->name(), highlight),
       account(a) {
-    if (tqparent->columns() >= 3) {
+    if (parent->columns() >= 3) {
         setText(2, a->description());
     }
     //kdDebug()<<k_funcinfo<<endl;
@@ -81,8 +81,8 @@ AccountsView::AccountItem::AccountItem(Account *a, TQListViewItem *p, bool highl
     //kdDebug()<<k_funcinfo<<endl;
 }
 
-AccountsView::AccountItem::AccountItem(TQString text, Account *a, TQListViewItem *tqparent, bool highlight)
-    : DoubleListViewBase::MasterListItem(tqparent, text, highlight),
+AccountsView::AccountItem::AccountItem(TQString text, Account *a, TQListViewItem *parent, bool highlight)
+    : DoubleListViewBase::MasterListItem(parent, text, highlight),
       account(a) {
     //kdDebug()<<k_funcinfo<<endl;
 }
@@ -93,8 +93,8 @@ void AccountsView::AccountItem::add(int col, const TQDate &date, const EffortCos
         m_slaveItem->setText(col, KGlobal::locale()->formatMoney(cm.cost(), "", 0));
 }
 
-AccountsView::AccountsView(Project &project, View *view, TQWidget *tqparent)
-    : TQWidget(tqparent, "Accounts view"),
+AccountsView::AccountsView(Project &project, View *view, TQWidget *parent)
+    : TQWidget(parent, "Accounts view"),
       m_mainview(view),
       m_project(project),
       m_accounts(project.accounts()) {
@@ -165,32 +165,32 @@ void AccountsView::initAccList(const AccountList &list) {
     createPeriods();
 }
 
-void AccountsView::initAccSubItems(Account *acc, AccountsView::AccountItem *tqparent) {
+void AccountsView::initAccSubItems(Account *acc, AccountsView::AccountItem *parent) {
     if (!acc->accountList().isEmpty()) {
-/*        AccountsView::AccountItem *a = new AccountsView::AccountItem(i18n("Subaccounts"), acc, tqparent);
-        DoubleListViewBase::SlaveListItem *i = new DoubleListViewBase::SlaveListItem(a, tqparent->period);
+/*        AccountsView::AccountItem *a = new AccountsView::AccountItem(i18n("Subaccounts"), acc, parent);
+        DoubleListViewBase::SlaveListItem *i = new DoubleListViewBase::SlaveListItem(a, parent->period);
         a->period = i;*/
     
-        initAccList(acc->accountList(), tqparent);
+        initAccList(acc->accountList(), parent);
     }
-//     AccountsView::AccountItem *a = new AccountsView::AccountItem(i18n("Variance"), acc, tqparent, true);
-//     DoubleListViewBase::SlaveListItem *i = new DoubleListViewBase::SlaveListItem(a, tqparent->period, true);
+//     AccountsView::AccountItem *a = new AccountsView::AccountItem(i18n("Variance"), acc, parent, true);
+//     DoubleListViewBase::SlaveListItem *i = new DoubleListViewBase::SlaveListItem(a, parent->period, true);
 //     a->period = i;
 // 
-//     a = new AccountsView::AccountItem(i18n("Actual"), acc, tqparent);
-//     i = new DoubleListViewBase::SlaveListItem(a, tqparent->period);
+//     a = new AccountsView::AccountItem(i18n("Actual"), acc, parent);
+//     i = new DoubleListViewBase::SlaveListItem(a, parent->period);
 //     a->period = i;
 // 
-//     a = new AccountsView::AccountItem(i18n("Planned"), acc, tqparent);
-//     i = new DoubleListViewBase::SlaveListItem(a, tqparent->period);
+//     a = new AccountsView::AccountItem(i18n("Planned"), acc, parent);
+//     i = new DoubleListViewBase::SlaveListItem(a, parent->period);
 //     a->period = i;
 
 }
 
-void AccountsView::initAccList(const AccountList &list, AccountsView::AccountItem *tqparent) {
+void AccountsView::initAccList(const AccountList &list, AccountsView::AccountItem *parent) {
     AccountListIterator it = list;
     for (it.toLast(); it.current(); --it) {
-        AccountsView::AccountItem *a = new AccountsView::AccountItem(it.current(), tqparent);
+        AccountsView::AccountItem *a = new AccountsView::AccountItem(it.current(), parent);
         a->setOpen(true);
         a->setExpandable(!it.current()->isElement());
         initAccSubItems(it.current(), a);
diff --git a/kplato/kptaccountsview.h b/kplato/kptaccountsview.h
index 973d74843..d3fea502b 100644
--- a/kplato/kptaccountsview.h
+++ b/kplato/kptaccountsview.h
@@ -61,7 +61,7 @@ class AccountsView : public TQWidget
   TQ_OBJECT
 public:
 
-    AccountsView(Project &project, View *view, TQWidget *tqparent);
+    AccountsView(Project &project, View *view, TQWidget *parent);
 
     //~AccountsView();
 
@@ -90,9 +90,9 @@ protected:
 private:
     class AccountItem : public DoubleListViewBase::MasterListItem {
     public:
-        AccountItem(Account *a, TQListView *tqparent, bool highlight=false);
-        AccountItem(Account *a, TQListViewItem *tqparent, bool highlight=false);
-        AccountItem(TQString text, Account *a, TQListViewItem *tqparent, bool _highlight=false);
+        AccountItem(Account *a, TQListView *parent, bool highlight=false);
+        AccountItem(Account *a, TQListViewItem *parent, bool highlight=false);
+        AccountItem(TQString text, Account *a, TQListViewItem *parent, bool _highlight=false);
         
         void add(int col, const TQDate &date, const EffortCost &ec);
         
@@ -102,8 +102,8 @@ private:
 
     void init();
     void initAccList(const AccountList &list);
-    void initAccSubItems(Account *acc, AccountItem *tqparent);
-    void initAccList(const AccountList &list, AccountItem *tqparent);
+    void initAccSubItems(Account *acc, AccountItem *parent);
+    void initAccList(const AccountList &list, AccountItem *parent);
     void createPeriods();
     void clearPeriods();
     TQString periodText(int offset);
diff --git a/kplato/kptaccountsviewconfigdialog.cc b/kplato/kptaccountsviewconfigdialog.cc
index 595061d25..0d1a1015d 100644
--- a/kplato/kptaccountsviewconfigdialog.cc
+++ b/kplato/kptaccountsviewconfigdialog.cc
@@ -67,8 +67,8 @@ bool AccountsviewConfigDialog::isCumulative() {
 
 
 //----------------------------
-AccountsviewConfigPanel::AccountsviewConfigPanel(TQWidget *tqparent)
-    : AccountsviewConfigurePanelBase(tqparent) {
+AccountsviewConfigPanel::AccountsviewConfigPanel(TQWidget *parent)
+    : AccountsviewConfigurePanelBase(parent) {
     
     connect(dateEdit, TQT_SIGNAL(changed(TQDate)), TQT_SLOT(slotChanged()));
     connect(periodBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
diff --git a/kplato/kptaccountsviewconfigdialog.h b/kplato/kptaccountsviewconfigdialog.h
index 946481fdd..567f18219 100644
--- a/kplato/kptaccountsviewconfigdialog.h
+++ b/kplato/kptaccountsviewconfigdialog.h
@@ -37,7 +37,7 @@ class AccountsviewConfigDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    AccountsviewConfigDialog(const TQDate &date, int period, const TQStringList &periodTexts, bool cumulative, TQWidget *tqparent);
+    AccountsviewConfigDialog(const TQDate &date, int period, const TQStringList &periodTexts, bool cumulative, TQWidget *parent);
 
     TQDate date();
     int period();
@@ -52,7 +52,7 @@ class AccountsviewConfigPanel : public AccountsviewConfigurePanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    AccountsviewConfigPanel(TQWidget *tqparent);
+    AccountsviewConfigPanel(TQWidget *parent);
     
 public slots:
     void slotChanged();
diff --git a/kplato/kptcalendar.cc b/kplato/kptcalendar.cc
index 9412f30e8..486c3dacd 100644
--- a/kplato/kptcalendar.cc
+++ b/kplato/kptcalendar.cc
@@ -507,9 +507,9 @@ Calendar::Calendar()
     init();
 }
 
-Calendar::Calendar(TQString name, Calendar *tqparent)
+Calendar::Calendar(TQString name, Calendar *parent)
     : m_name(name),
-      m_parent(tqparent),
+      m_parent(parent),
       m_project(0),
       m_deleted(false),
       m_days() {
@@ -531,7 +531,7 @@ Calendar::Calendar(Calendar *calendar)
 
 const Calendar &Calendar::copy(Calendar &calendar) {
     m_name = calendar.name();
-    m_parent = calendar.tqparent();
+    m_parent = calendar.parent();
     m_deleted = calendar.isDeleted();
     m_id = calendar.id();
     
@@ -605,9 +605,9 @@ bool Calendar::load(TQDomElement &element) {
     //kdDebug()<<k_funcinfo<<element.text()<<endl;
     //bool ok;
     setId(element.attribute("id"));
-    m_parentId = element.attribute("tqparent");
+    m_parentId = element.attribute("parent");
     m_name = element.attribute("name","");
-    //TODO tqparent
+    //TODO parent
     
     TQDomNodeList list = element.childNodes();
     for (unsigned int i=0; i<list.count(); ++i) {
@@ -651,7 +651,7 @@ void Calendar::save(TQDomElement &element) const {
     TQDomElement me = element.ownerDocument().createElement("calendar");
     element.appendChild(me);
     if (m_parent && !m_parent->isDeleted()) 
-        me.setAttribute("tqparent", m_parent->id());
+        me.setAttribute("parent", m_parent->id());
     me.setAttribute("name", m_name);
     me.setAttribute("id", m_id);
     m_weekdays->save(me);
@@ -1014,7 +1014,7 @@ void CalendarWeekdays::printDebug(TQCString indent) {
 }
 void Calendar::printDebug(TQCString indent) {
     kdDebug()<<indent<<"Calendar "<<m_id<<": '"<<m_name<<"' Deleted="<<m_deleted<<endl;
-    kdDebug()<<indent<<"  Parent: "<<(m_parent ? m_parent->name() : "No tqparent")<<endl;
+    kdDebug()<<indent<<"  Parent: "<<(m_parent ? m_parent->name() : "No parent")<<endl;
     m_weekdays->printDebug(indent + "  ");
     kdDebug()<<indent<<"  Days --------"<<endl;
     TQPtrListIterator<CalendarDay> it = m_days;
diff --git a/kplato/kptcalendar.h b/kplato/kptcalendar.h
index 6e35622a6..09c3980cb 100644
--- a/kplato/kptcalendar.h
+++ b/kplato/kptcalendar.h
@@ -187,7 +187,7 @@ public:
 /**
  * Calendar defines the working and nonworking days and hours.
  * A day can have the three states None (Undefined), NonWorking, or Working.
- * A calendar can have a tqparent calendar that defines the days that are 
+ * A calendar can have a parent calendar that defines the days that are 
  * undefined in this calendar. If a day is still undefined, it defaults
  * to Nonworking.
  * A Working day has one or more work intervals to define the work hours.
@@ -205,15 +205,15 @@ class Calendar {
 
 public:
     Calendar();
-    Calendar(TQString name, Calendar *tqparent=0);
+    Calendar(TQString name, Calendar *parent=0);
     Calendar(Calendar *calendar);
     ~Calendar();
 
     TQString name() const { return m_name; }
     void setName(TQString name) { m_name = name; }
 
-    Calendar *tqparent() const { return m_parent; }
-    void setParent(Calendar *tqparent) { m_parent = tqparent; }
+    Calendar *parent() const { return m_parent; }
+    void setParent(Calendar *parent) { m_parent = parent; }
     
     Project *project() const { return m_project; }
     void setProject(Project *project);
diff --git a/kplato/kptcalendaredit.cc b/kplato/kptcalendaredit.cc
index 297fc64d8..ab2df8bd0 100644
--- a/kplato/kptcalendaredit.cc
+++ b/kplato/kptcalendaredit.cc
@@ -49,8 +49,8 @@
 namespace KPlato
 {
 
-CalendarEdit::CalendarEdit (TQWidget *tqparent, const char */*name*/)
-    : CalendarEditBase(tqparent),
+CalendarEdit::CalendarEdit (TQWidget *parent, const char */*name*/)
+    : CalendarEditBase(parent),
       m_calendar(0)
  {
 
diff --git a/kplato/kptcalendaredit.h b/kplato/kptcalendaredit.h
index d2a8f8530..7f602712b 100644
--- a/kplato/kptcalendaredit.h
+++ b/kplato/kptcalendaredit.h
@@ -35,7 +35,7 @@ class CalendarEdit : public CalendarEditBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    CalendarEdit (TQWidget *tqparent=0, const char *name=0);
+    CalendarEdit (TQWidget *parent=0, const char *name=0);
 
     Calendar *getCalendar() { return m_calendar; }
     void setCalendar(Calendar *cal);
diff --git a/kplato/kptcalendareditbase.cc b/kplato/kptcalendareditbase.cc
index e9bbd00a6..aaa6fab06 100644
--- a/kplato/kptcalendareditbase.cc
+++ b/kplato/kptcalendareditbase.cc
@@ -39,11 +39,11 @@ namespace KPlato
 {
 
 /*
- *  Constructs a CalendarEditBase as a child of 'tqparent', with the
+ *  Constructs a CalendarEditBase as a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  */
-CalendarEditBase::CalendarEditBase( TQWidget* tqparent, const char* name, WFlags fl )
-    : TQWidget( tqparent, name, fl )
+CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags fl )
+    : TQWidget( parent, name, fl )
 {
     if ( !name )
 	setName( "CalendarEditBase" );
diff --git a/kplato/kptcalendareditbase.h b/kplato/kptcalendareditbase.h
index cdf4d621b..df2f9c0c3 100644
--- a/kplato/kptcalendareditbase.h
+++ b/kplato/kptcalendareditbase.h
@@ -46,7 +46,7 @@ class CalendarEditBase : public TQWidget
   TQ_OBJECT
 
 public:
-    CalendarEditBase( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+    CalendarEditBase( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CalendarEditBase();
 
     TQGroupBox* groupBox2;
diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cc
index 5fe590ec5..b5a2d59cb 100644
--- a/kplato/kptcalendarlistdialog.cc
+++ b/kplato/kptcalendarlistdialog.cc
@@ -87,7 +87,7 @@ public:
                 macro->addCommand(new CalendarModifyNameCmd(part, original, calendar->name()));
             }
             Calendar *c = base ? base->baseCalendar() : 0;
-            if (c != original->tqparent()) {
+            if (c != original->parent()) {
                 if (macro == 0) macro = new KMacroCommand("");
                 macro->addCommand(new CalendarModifyParentCmd(part, original, c));
                 //kdDebug()<<k_funcinfo<<"Base modified: "<<c->name()<<endl;
@@ -163,8 +163,8 @@ private:
 };
 
 //----------------------------------------------------
-CalendarListDialog::CalendarListDialog(Project &p, TQWidget *tqparent, const char *name)
-    : KDialogBase( Swallow, i18n("Calendar's Settings"), Ok|Cancel, Ok, tqparent, name, true, true),
+CalendarListDialog::CalendarListDialog(Project &p, TQWidget *parent, const char *name)
+    : KDialogBase( Swallow, i18n("Calendar's Settings"), Ok|Cancel, Ok, parent, name, true, true),
       project(p)
 {
     //kdDebug()<<k_funcinfo<<&p<<endl;
@@ -224,8 +224,8 @@ void CalendarListDialog::slotOk() {
 }
 
 //--------------------------------------------------
-CalendarListDialogImpl::CalendarListDialogImpl (Project &p, TQWidget *tqparent) 
-    : CalendarListDialogBase(tqparent),
+CalendarListDialogImpl::CalendarListDialogImpl (Project &p, TQWidget *parent) 
+    : CalendarListDialogBase(parent),
       project(p),
       m_renameItem(0) {
 
@@ -263,7 +263,7 @@ void CalendarListDialogImpl::setBaseCalendars() {
     for (;it.current(); ++it) {
         CalendarListViewItem *item = dynamic_cast<CalendarListViewItem *>(it.current());
         if (item) {
-            item->base = findItem(item->calendar->tqparent());
+            item->base = findItem(item->calendar->parent());
         }
     }
 }
@@ -311,7 +311,7 @@ void CalendarListDialogImpl::slotSelectionChanged(TQListViewItem *listItem) {
                 i++;
                 if (item == cal->base) {
                     me = i;
-                    //kdDebug()<<k_funcinfo<<"item="<<item<<": cal="<<cal->calendar->name()<<" has tqparent "<<cal->base->calendar->name()<<endl;
+                    //kdDebug()<<k_funcinfo<<"item="<<item<<": cal="<<cal->calendar->name()<<" has parent "<<cal->base->calendar->name()<<endl;
                 }
             }
         }
diff --git a/kplato/kptcalendarlistdialog.h b/kplato/kptcalendarlistdialog.h
index 327563710..032ed72eb 100644
--- a/kplato/kptcalendarlistdialog.h
+++ b/kplato/kptcalendarlistdialog.h
@@ -41,7 +41,7 @@ class CalendarListDialogImpl : public CalendarListDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    CalendarListDialogImpl(Project &project, TQWidget *tqparent);
+    CalendarListDialogImpl(Project &project, TQWidget *parent);
 
     void setBaseCalendars();
     
@@ -92,7 +92,7 @@ class CalendarListDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    CalendarListDialog(Project &project, TQWidget *tqparent=0, const char *name=0);
+    CalendarListDialog(Project &project, TQWidget *parent=0, const char *name=0);
     
     KCommand *buildCommand(Part *part);
 
diff --git a/kplato/kptcalendarlistdialogbase.cc b/kplato/kptcalendarlistdialogbase.cc
index b7207f828..764c7e983 100644
--- a/kplato/kptcalendarlistdialogbase.cc
+++ b/kplato/kptcalendarlistdialogbase.cc
@@ -40,8 +40,8 @@
 namespace KPlato
 {
 
-CalendarListDialogBase::CalendarListDialogBase( TQWidget* tqparent, const char* name, WFlags fl )
-    : CalendarListPanel( tqparent, name, fl )
+CalendarListDialogBase::CalendarListDialogBase( TQWidget* parent, const char* name, WFlags fl )
+    : CalendarListPanel( parent, name, fl )
 {
     if ( !name )
         setName( "CalendarListDialogBase" );
diff --git a/kplato/kptcalendarlistdialogbase.h b/kplato/kptcalendarlistdialogbase.h
index 82cf90528..dd11a1c76 100644
--- a/kplato/kptcalendarlistdialogbase.h
+++ b/kplato/kptcalendarlistdialogbase.h
@@ -46,7 +46,7 @@ class CalendarListDialogBase : public CalendarListPanel
     Q_OBJECT
   TQ_OBJECT
 public:
-    CalendarListDialogBase( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+    CalendarListDialogBase( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
     CalendarEdit* calendar;
 
diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc
index 6dfba278f..e63229448 100644
--- a/kplato/kptcalendarpanel.cc
+++ b/kplato/kptcalendarpanel.cc
@@ -56,14 +56,14 @@ public:
 };
 
 
-CalendarPanel::CalendarPanel(TQWidget *tqparent, TQDate dt, const char *name, WFlags f)
-  : TQFrame(tqparent,name, f)
+CalendarPanel::CalendarPanel(TQWidget *parent, TQDate dt, const char *name, WFlags f)
+  : TQFrame(parent,name, f)
 {
   init( dt );
 }
 
-CalendarPanel::CalendarPanel( TQWidget *tqparent, const char *name )
-  : TQFrame(tqparent,name)
+CalendarPanel::CalendarPanel( TQWidget *parent, const char *name )
+  : TQFrame(parent,name)
 {
     init( TQDate::tqcurrentDate() );
 }
diff --git a/kplato/kptcalendarpanel.h b/kplato/kptcalendarpanel.h
index 18302ec14..9cf6c4f8f 100644
--- a/kplato/kptcalendarpanel.h
+++ b/kplato/kptcalendarpanel.h
@@ -54,13 +54,13 @@ public:
     /** The usual constructor.  The given date will be displayed
     * initially.
     **/
-    CalendarPanel(TQWidget *tqparent=0, TQDate=TQDate::tqcurrentDate(), 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
     * current date.
     */
-    CalendarPanel( TQWidget *tqparent, const char *name );
+    CalendarPanel( TQWidget *parent, const char *name );
     
     /**
     * The destructor.
diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc
index fb4399458..59690e3a8 100644
--- a/kplato/kptcanvasitem.cc
+++ b/kplato/kptcanvasitem.cc
@@ -265,14 +265,14 @@ void PertMilestoneItem::printDebug( int /*info*/ )
 
 ////////////////////   PertRelationItem   //////////////////////////
 
-PertRelationItem::PertRelationItem( PertCanvas *view, PertNodeItem *tqparent, PertNodeItem *child, Relation *rel)
+PertRelationItem::PertRelationItem( PertCanvas *view, PertNodeItem *parent, PertNodeItem *child, Relation *rel)
     : TQCanvasPolygon(view->canvas()),
     m_view(view),
     m_rel(rel),
-    m_parentItem(tqparent),
+    m_parentItem(parent),
     m_childItem(child)
 {
-    //kdDebug()<<k_funcinfo<<"Parent="<<tqparent->node().name()<<" Child="<<child->node().name()<<endl;
+    //kdDebug()<<k_funcinfo<<"Parent="<<parent->node().name()<<" Child="<<child->node().name()<<endl;
     draw();
     tqsetVisible(true);
 }
@@ -289,10 +289,10 @@ void PertRelationItem::draw()
 {
     //kdDebug()<<k_funcinfo<<endl;
 	// Some "rules":
-	//  a) Relation::FinishStart: child column > tqparent column
-	//  b) Relation::FinishFinish: child column >= tqparent column
-	//  c) Relation::StartStart: child column >= tqparent column
-	//  d) Child row can be >= tqparent row
+	//  a) Relation::FinishStart: child column > parent column
+	//  b) Relation::FinishFinish: child column >= parent column
+	//  c) Relation::StartStart: child column >= parent column
+	//  d) Child row can be >= parent row
 
 	wgap = m_view->verticalGap();
 	hgap = m_view->horizontalGap();
@@ -337,7 +337,7 @@ void PertRelationItem::draw()
 	setZ(45);
 
 /*#ifndef NDEBUG
-	kdDebug()<<" PertNodeRelation from tqparent: "<<m_rel->tqparent()->name()<<" to child: "<<m_rel->child()->name()<<endl;
+	kdDebug()<<" PertNodeRelation from parent: "<<m_rel->parent()->name()<<" to child: "<<m_rel->child()->name()<<endl;
 	TQPointArray pa = poly;
     for (int i = 0; i < pa.size(); ++i)
         kdDebug()<<"            pa["<<i<<"]="<<pa[i].x()<<","<<pa[i].y()<<endl;
@@ -585,7 +585,7 @@ void PertRelationItem::setStartStartPoints()
 
 void PertRelationItem::drawShape(TQPainter &p)
 {
-    //kdDebug()<<k_funcinfo<<" "<<m_rel->tqparent()->name()<<" to "<<m_rel->child()->name()<<endl;
+    //kdDebug()<<k_funcinfo<<" "<<m_rel->parent()->name()<<" to "<<m_rel->child()->name()<<endl;
     // cannot use polygon's drawShape() as it doesn't use the pen
 	setBrush(Qt::NoBrush);
 	TQPointArray a = poly;
@@ -616,7 +616,7 @@ TQPointArray PertRelationItem::areaPoints () const
     pa[1] = pa[0] + TQPoint(right-left+pw*2,0);
     pa[2] = pa[1] + TQPoint(0,bottom-top+pw*2);
     pa[3] = pa[0] + TQPoint(0,bottom-top+pw*2);
-/*    kdDebug()<<k_funcinfo<<" areaPoints: "<<m_rel->tqparent()->name()<<" to "<<m_rel->child()->name()<<endl;
+/*    kdDebug()<<k_funcinfo<<" areaPoints: "<<m_rel->parent()->name()<<" to "<<m_rel->child()->name()<<endl;
 	kdDebug()<<"      "<<pa[0].x()<<","<<pa[0].y()<<"      "<<pa[1].x()<<","<<pa[1].y()<<endl;
 	kdDebug()<<"      "<<pa[2].x()<<","<<pa[2].y()<<"      "<<pa[3].x()<<","<<pa[3].y()<<endl;*/
     return pa;
@@ -674,22 +674,22 @@ KDGanttViewTaskLink::LinkType ItemBase::kdLinkType(int relationType) {
 ////////////////////   GanttViewSummaryItem   //////////////////////////
 
 
-GanttViewSummaryItem::GanttViewSummaryItem(KDGanttView *tqparent, Node *node)
-    : KDGanttViewSummaryItem(tqparent, node->name()),
+GanttViewSummaryItem::GanttViewSummaryItem(KDGanttView *parent, Node *node)
+    : KDGanttViewSummaryItem(parent, node->name()),
       m_node(node),
-      m_view(tqparent)
+      m_view(parent)
 {
     setExpandable(true);
     setOpen(true);
 }
 
-GanttViewSummaryItem::GanttViewSummaryItem(KDGanttViewItem *tqparent, Node *node)
-    : KDGanttViewSummaryItem(tqparent, node->name()),
+GanttViewSummaryItem::GanttViewSummaryItem(KDGanttViewItem *parent, Node *node)
+    : KDGanttViewSummaryItem(parent, node->name()),
       m_node(node),
       m_view(0)
 {
     m_drawn = false;
-    GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(tqparent);
+    GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(parent);
     if (p)
         m_view = p->ganttView();
     setExpandable(true);
@@ -759,20 +759,20 @@ KDGanttViewItem *GanttViewSummaryItem::find(KDGanttViewItem *item, Node *node)
 ////////////////////   GanttViewTaskItem   //////////////////////////
 
 
-GanttViewTaskItem::GanttViewTaskItem(KDGanttView *tqparent, KPlato::Task *task)
-    : KDGanttViewTaskItem(tqparent, task->name()),
+GanttViewTaskItem::GanttViewTaskItem(KDGanttView *parent, KPlato::Task *task)
+    : KDGanttViewTaskItem(parent, task->name()),
       m_task(task),
-      m_view(tqparent)
+      m_view(parent)
 {
 }
 
-GanttViewTaskItem::GanttViewTaskItem(KDGanttViewItem *tqparent, KPlato::Task *task)
-    : KDGanttViewTaskItem(tqparent, task->name()),
+GanttViewTaskItem::GanttViewTaskItem(KDGanttViewItem *parent, KPlato::Task *task)
+    : KDGanttViewTaskItem(parent, task->name()),
       m_task(task),
       m_view()
 {
     m_drawn = false;
-    GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(tqparent);
+    GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(parent);
     if (p)
         m_view = p->ganttView();
 }
@@ -840,20 +840,20 @@ KDGanttViewItem *GanttViewTaskItem::find(KDGanttViewItem *item, Node *node)
 ////////////////////   GanttViewEventItem   //////////////////////////
 
 
-GanttViewEventItem::GanttViewEventItem(KDGanttView *tqparent, KPlato::Task *task)
-    : KDGanttViewEventItem(tqparent, task->name()),
+GanttViewEventItem::GanttViewEventItem(KDGanttView *parent, KPlato::Task *task)
+    : KDGanttViewEventItem(parent, task->name()),
       m_task(task),
-      m_view(tqparent)
+      m_view(parent)
 {
 }
 
-GanttViewEventItem::GanttViewEventItem(KDGanttViewItem *tqparent, KPlato::Task *task)
-    : KDGanttViewEventItem(tqparent, task->name()),
+GanttViewEventItem::GanttViewEventItem(KDGanttViewItem *parent, KPlato::Task *task)
+    : KDGanttViewEventItem(parent, task->name()),
       m_task(task),
       m_view()
 {
     m_drawn = false;
-    GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(tqparent);
+    GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(parent);
     if (p)
         m_view = p->ganttView();
 }
diff --git a/kplato/kptcanvasitem.h b/kplato/kptcanvasitem.h
index 98d351584..705a9a17e 100644
--- a/kplato/kptcanvasitem.h
+++ b/kplato/kptcanvasitem.h
@@ -165,7 +165,7 @@ public:
 class PertRelationItem : public TQCanvasPolygon
 {
 public:
-    PertRelationItem(PertCanvas *view, PertNodeItem *tqparent, PertNodeItem *child, Relation *rel);
+    PertRelationItem(PertCanvas *view, PertNodeItem *parent, PertNodeItem *child, Relation *rel);
     virtual ~PertRelationItem();
 
     virtual int rtti() const;
@@ -222,8 +222,8 @@ protected:
 class GanttViewSummaryItem : public KDGanttViewSummaryItem, public ItemBase
 {
 public:
-    GanttViewSummaryItem(KDGanttView *tqparent, Node *node);
-    GanttViewSummaryItem(KDGanttViewItem *tqparent, Node *node);
+    GanttViewSummaryItem(KDGanttView *parent, Node *node);
+    GanttViewSummaryItem(KDGanttViewItem *parent, Node *node);
 
     Node *getNode() { return m_node; }
     void insertRelations(GanttView *view);
@@ -244,8 +244,8 @@ protected:
 class GanttViewTaskItem : public KDGanttViewTaskItem, public ItemBase
 {
 public:
-    GanttViewTaskItem(KDGanttView *tqparent, KPlato::Task *task);
-    GanttViewTaskItem(KDGanttViewItem *tqparent, KPlato::Task *task);
+    GanttViewTaskItem(KDGanttView *parent, KPlato::Task *task);
+    GanttViewTaskItem(KDGanttViewItem *parent, KPlato::Task *task);
 
     KPlato::Task *getTask() const { return m_task; }
     void insertRelations(GanttView *view);
@@ -266,8 +266,8 @@ protected:
 class GanttViewEventItem : public KDGanttViewEventItem, public ItemBase
 {
 public:
-    GanttViewEventItem(KDGanttView *tqparent, KPlato::Task *task);
-    GanttViewEventItem(KDGanttViewItem *tqparent, KPlato::Task *task);
+    GanttViewEventItem(KDGanttView *parent, KPlato::Task *task);
+    GanttViewEventItem(KDGanttViewItem *parent, KPlato::Task *task);
 
     KPlato::Task *getTask() { return m_task; }
     void insertRelations(GanttView *view);
diff --git a/kplato/kptcommand.cc b/kplato/kptcommand.cc
index 364d552db..662c0dd0d 100644
--- a/kplato/kptcommand.cc
+++ b/kplato/kptcommand.cc
@@ -170,7 +170,7 @@ CalendarModifyParentCmd::CalendarModifyParentCmd(Part *part, Calendar *cal, Cale
     : NamedCommand(part, name),
       m_cal(cal) {
       
-    m_oldvalue = cal->tqparent();
+    m_oldvalue = cal->parent();
     m_newvalue = newvalue;
     //kdDebug()<<k_funcinfo<<cal->name()<<endl;
     // TODO check if any resources uses this calendar
@@ -428,15 +428,15 @@ void TaskAddCmd::unexecute() {
     setCommandType(1);
 }
 
-SubtaskAddCmd::SubtaskAddCmd(Part *part, Project *project, Node *node, Node *tqparent,  TQString name)
+SubtaskAddCmd::SubtaskAddCmd(Part *part, Project *project, Node *node, Node *parent,  TQString name)
     : NamedCommand(part, name),
       m_project(project),
       m_node(node),
-      m_parent(tqparent),
+      m_parent(parent),
       m_added(false) {
 
     // set some reasonable defaults for normally calculated values
-    node->setStartTime(tqparent->startTime());
+    node->setStartTime(parent->startTime());
     node->setEndTime(node->startTime() + node->duration());
     node->setEarliestStart(node->startTime());
     node->setLatestFinish(node->endTime());
@@ -637,27 +637,27 @@ void NodeModifyIdCmd::unexecute() {
 NodeIndentCmd::NodeIndentCmd(Part *part, Node &node, TQString name)
     : NamedCommand(part, name),
       m_node(node), 
-      m_newtqparent(0), 
+      m_newparent(0), 
       m_newindex(-1) {
 
 }
 void NodeIndentCmd::execute() {
-    m_oldtqparent = m_node.getParent();
-    m_oldindex = m_oldtqparent->findChildNode(&m_node);
+    m_oldparent = m_node.getParent();
+    m_oldindex = m_oldparent->findChildNode(&m_node);
     Project *p = dynamic_cast<Project *>(m_node.projectNode());
     if (p && p->indentTask(&m_node)) {
-        m_newtqparent = m_node.getParent();
-        m_newindex = m_newtqparent->findChildNode(&m_node);
-        m_node.setParent(m_newtqparent);
+        m_newparent = m_node.getParent();
+        m_newindex = m_newparent->findChildNode(&m_node);
+        m_node.setParent(m_newparent);
     }
     
     setCommandType(1);
 }
 void NodeIndentCmd::unexecute() {
     if (m_newindex != -1) {
-        m_newtqparent->delChildNode(m_newindex, false);
-        m_oldtqparent->insertChildNode(m_oldindex, &m_node);
-        m_node.setParent(m_oldtqparent);
+        m_newparent->delChildNode(m_newindex, false);
+        m_oldparent->insertChildNode(m_oldindex, &m_node);
+        m_node.setParent(m_oldparent);
         m_newindex = -1;
     }
     
@@ -667,26 +667,26 @@ void NodeIndentCmd::unexecute() {
 NodeUnindentCmd::NodeUnindentCmd(Part *part, Node &node, TQString name)
     : NamedCommand(part, name),
       m_node(node), 
-      m_newtqparent(0),  
+      m_newparent(0),  
       m_newindex(-1) {
 }
 void NodeUnindentCmd::execute() {
-    m_oldtqparent = m_node.getParent();
-    m_oldindex = m_oldtqparent->findChildNode(&m_node);
+    m_oldparent = m_node.getParent();
+    m_oldindex = m_oldparent->findChildNode(&m_node);
     Project *p = dynamic_cast<Project *>(m_node.projectNode());
     if (p && p->unindentTask(&m_node)) {
-        m_newtqparent = m_node.getParent();
-        m_newindex = m_newtqparent->findChildNode(&m_node);
-        m_node.setParent(m_newtqparent);
+        m_newparent = m_node.getParent();
+        m_newindex = m_newparent->findChildNode(&m_node);
+        m_node.setParent(m_newparent);
     }
     
     setCommandType(1);
 }
 void NodeUnindentCmd::unexecute() {
     if (m_newindex != -1) {
-        m_newtqparent->delChildNode(m_newindex, false);
-        m_oldtqparent->insertChildNode(m_oldindex, &m_node);
-        m_node.setParent(m_oldtqparent);
+        m_newparent->delChildNode(m_newindex, false);
+        m_oldparent->insertChildNode(m_oldindex, &m_node);
+        m_node.setParent(m_oldparent);
         m_newindex = -1;
     }
     
@@ -741,7 +741,7 @@ AddRelationCmd::AddRelationCmd(Part *part, Relation *rel, TQString name)
       m_rel(rel) {
     
     m_taken = true;
-    Node *p = rel->tqparent()->projectNode();
+    Node *p = rel->parent()->projectNode();
     if (p) {
         TQIntDictIterator<Schedule> it = p->schedules();
         for (; it.current(); ++it) {
@@ -754,16 +754,16 @@ AddRelationCmd::~AddRelationCmd() {
         delete m_rel;
 }
 void AddRelationCmd::execute() {
-    //kdDebug()<<k_funcinfo<<m_rel->tqparent()<<" to "<<m_rel->child()<<endl;
+    //kdDebug()<<k_funcinfo<<m_rel->parent()<<" to "<<m_rel->child()<<endl;
     m_taken = false;
-    m_rel->tqparent()->addDependChildNode(m_rel);
+    m_rel->parent()->addDependChildNode(m_rel);
     m_rel->child()->addDependParentNode(m_rel);
     setSchScheduled(false);
     setCommandType(1);
 }
 void AddRelationCmd::unexecute() {
     m_taken = true;
-    m_rel->tqparent()->takeDependChildNode(m_rel);
+    m_rel->parent()->takeDependChildNode(m_rel);
     m_rel->child()->takeDependParentNode(m_rel);
     setSchScheduled();
     setCommandType(1);
@@ -774,7 +774,7 @@ DeleteRelationCmd::DeleteRelationCmd(Part *part, Relation *rel, TQString name)
       m_rel(rel) {
     
     m_taken = false;
-    Node *p = rel->tqparent()->projectNode();
+    Node *p = rel->parent()->projectNode();
     if (p) {
         TQIntDictIterator<Schedule> it = p->schedules();
         for (; it.current(); ++it) {
@@ -787,16 +787,16 @@ DeleteRelationCmd::~DeleteRelationCmd() {
         delete m_rel;
 }
 void DeleteRelationCmd::execute() {
-    //kdDebug()<<k_funcinfo<<m_rel->tqparent()<<" to "<<m_rel->child()<<endl;
+    //kdDebug()<<k_funcinfo<<m_rel->parent()<<" to "<<m_rel->child()<<endl;
     m_taken = true;
-    m_rel->tqparent()->takeDependChildNode(m_rel);
+    m_rel->parent()->takeDependChildNode(m_rel);
     m_rel->child()->takeDependParentNode(m_rel);
     setSchScheduled(false);
     setCommandType(1);
 }
 void DeleteRelationCmd::unexecute() {
     m_taken = false;
-    m_rel->tqparent()->addDependChildNode(m_rel);
+    m_rel->parent()->addDependChildNode(m_rel);
     m_rel->child()->addDependParentNode(m_rel);
     setSchScheduled();
     setCommandType(1);
@@ -808,7 +808,7 @@ ModifyRelationTypeCmd::ModifyRelationTypeCmd(Part *part, Relation *rel, Relation
       m_newtype(type) {
     
     m_oldtype = rel->type();
-    Node *p = rel->tqparent()->projectNode();
+    Node *p = rel->parent()->projectNode();
     if (p) {
         TQIntDictIterator<Schedule> it = p->schedules();
         for (; it.current(); ++it) {
@@ -833,7 +833,7 @@ ModifyRelationLagCmd::ModifyRelationLagCmd(Part *part, Relation *rel, Duration l
       m_newlag(lag) {
     
     m_oldlag = rel->lag();
-    Node *p = rel->tqparent()->projectNode();
+    Node *p = rel->parent()->projectNode();
     if (p) {
         TQIntDictIterator<Schedule> it = p->schedules();
         for (; it.current(); ++it) {
@@ -1044,7 +1044,7 @@ void AddResourceGroupRequestCmd::unexecute() {
 
 RemoveResourceGroupRequestCmd::RemoveResourceGroupRequestCmd(Part *part, ResourceGroupRequest *request, TQString name)
     : NamedCommand(part, name),
-      m_task(request->tqparent()->task()),
+      m_task(request->parent()->task()),
       m_request(request) {
       
     m_mine = false;
@@ -1116,7 +1116,7 @@ RemoveResourceCmd::~RemoveResourceCmd() {
 void RemoveResourceCmd::execute() {
     TQPtrListIterator<ResourceRequest> it = m_requests;
     for (; it.current(); ++it) {
-        it.current()->tqparent()->takeResourceRequest(it.current());
+        it.current()->parent()->takeResourceRequest(it.current());
         //kdDebug()<<"Remove request for"<<it.current()->resource()->name()<<endl;
     }
     TQPtrListIterator<Appointment> ait = m_resource->appointments();
@@ -1139,7 +1139,7 @@ void RemoveResourceCmd::unexecute() {
     }
     TQPtrListIterator<ResourceRequest> it = m_requests;
     for (; it.current(); ++it) {
-        it.current()->tqparent()->addResourceRequest(it.current());
+        it.current()->parent()->addResourceRequest(it.current());
         //kdDebug()<<"Add request for "<<it.current()->resource()->name()<<endl;
     }
     AddResourceCmd::execute();
@@ -1375,8 +1375,8 @@ void RemoveResourceGroupCmd::execute() {
     int c=0;
     TQPtrListIterator<ResourceGroupRequest> it = m_group->requests();
     for (; it.current(); ++it) {
-        if (it.current()->tqparent()) {
-            it.current()->tqparent()->takeRequest(it.current());
+        if (it.current()->parent()) {
+            it.current()->parent()->takeRequest(it.current());
         }
         c = 1;
     }
@@ -1391,8 +1391,8 @@ void RemoveResourceGroupCmd::unexecute() {
     int c=0;
     TQPtrListIterator<ResourceGroupRequest> it = m_group->requests();
     for (; it.current(); ++it) {
-        if (it.current()->tqparent()) {
-            it.current()->tqparent()->addRequest(it.current());
+        if (it.current()->parent()) {
+            it.current()->parent()->addRequest(it.current());
         }
         c = 1;
     }
@@ -1467,20 +1467,20 @@ void ProjectModifyBaselineCmd::unexecute() {
     setCommandType(2);
 }
 
-AddAccountCmd::AddAccountCmd(Part *part, Project &project, Account *account, TQString tqparent, TQString name)
+AddAccountCmd::AddAccountCmd(Part *part, Project &project, Account *account, TQString parent, TQString name)
     : NamedCommand(part, name),
       m_project(project),
       m_account(account),
       m_parent(0),
-      m_parentName(tqparent) {
+      m_parentName(parent) {
     m_mine = true;
 }
 
-AddAccountCmd::AddAccountCmd(Part *part, Project &project, Account *account, Account *tqparent, TQString name)
+AddAccountCmd::AddAccountCmd(Part *part, Project &project, Account *account, Account *parent, TQString name)
     : NamedCommand(part, name),
       m_project(project),
       m_account(account),
-      m_parent(tqparent) {
+      m_parent(parent) {
     m_mine = true;
 }
 
@@ -1528,8 +1528,8 @@ void RemoveAccountCmd::execute() {
     if (m_isDefault) {
         m_project.accounts().setDefaultAccount(0);
     }
-    if (m_account->tqparent())
-        m_account->tqparent()->take(m_account);
+    if (m_account->parent())
+        m_account->parent()->take(m_account);
     else
         m_project.accounts().take(m_account);
     
@@ -1537,8 +1537,8 @@ void RemoveAccountCmd::execute() {
     m_mine = true;
 }
 void RemoveAccountCmd::unexecute() {
-    if (m_account->tqparent())
-        m_account->tqparent()->append(m_account);
+    if (m_account->parent())
+        m_account->parent()->append(m_account);
     else
         m_project.accounts().append(m_account);
     
diff --git a/kplato/kptcommand.h b/kplato/kptcommand.h
index 4c94e9786..1aaee441c 100644
--- a/kplato/kptcommand.h
+++ b/kplato/kptcommand.h
@@ -213,7 +213,7 @@ private:
 class SubtaskAddCmd : public NamedCommand
 {
 public:
-    SubtaskAddCmd(Part *part, Project *project, Node *node, Node *tqparent,  TQString name=0);
+    SubtaskAddCmd(Part *part, Project *project, Node *node, Node *parent,  TQString name=0);
     ~SubtaskAddCmd();
     void execute();
     void unexecute();
@@ -351,7 +351,7 @@ public:
 
 private:
     Node &m_node;
-    Node *m_oldtqparent, *m_newtqparent;
+    Node *m_oldparent, *m_newparent;
     int m_oldindex, m_newindex;
 };
 
@@ -364,7 +364,7 @@ public:
 
 private:
     Node &m_node;
-    Node *m_oldtqparent, *m_newtqparent;
+    Node *m_oldparent, *m_newparent;
     int m_oldindex, m_newindex;
 };
 
@@ -789,8 +789,8 @@ private:
 class AddAccountCmd : public NamedCommand
 {
 public:
-    AddAccountCmd(Part *part, Project &project, Account *account,  Account *tqparent=0, TQString name=0);
-    AddAccountCmd(Part *part, Project &project, Account *account,  TQString tqparent, TQString name=0);
+    AddAccountCmd(Part *part, Project &project, Account *account,  Account *parent=0, TQString name=0);
+    AddAccountCmd(Part *part, Project &project, Account *account,  TQString parent, TQString name=0);
     ~AddAccountCmd();
     void execute();
     void unexecute();
diff --git a/kplato/kptconfigbehaviorpanel.h b/kplato/kptconfigbehaviorpanel.h
index bf1ec6490..bbdb3cf46 100644
--- a/kplato/kptconfigbehaviorpanel.h
+++ b/kplato/kptconfigbehaviorpanel.h
@@ -35,7 +35,7 @@ class ConfigBehaviorPanel : public ConfigBehaviorPanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    ConfigBehaviorPanel(Behavior &behavior, TQWidget *tqparent=0, const char *name=0);
+    ConfigBehaviorPanel(Behavior &behavior, TQWidget *parent=0, const char *name=0);
 
     void setStartValues();
     bool ok();
diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc
index 5f7ca9ed4..729d64438 100644
--- a/kplato/kptconfigdialog.cc
+++ b/kplato/kptconfigdialog.cc
@@ -45,10 +45,10 @@ static inline TQPixmap loadIcon( const char * name ) {
 }
 
 
-ConfigDialog::ConfigDialog(Config &config, Project &project, TQWidget *tqparent, const char *)
+ConfigDialog::ConfigDialog(Config &config, Project &project, TQWidget *parent, const char *)
     : KDialogBase(KDialogBase::IconList, i18n("Configure KPlato"),
                   KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel| KDialogBase::Default,
-                  KDialogBase::Ok, tqparent),
+                  KDialogBase::Ok, parent),
       m_config(config)
 {
 
diff --git a/kplato/kptconfigdialog.h b/kplato/kptconfigdialog.h
index c30cd47b0..a172dfdea 100644
--- a/kplato/kptconfigdialog.h
+++ b/kplato/kptconfigdialog.h
@@ -36,7 +36,7 @@ class ConfigDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    ConfigDialog(Config &config, Project &project, TQWidget *tqparent=0, const char *name=0);
+    ConfigDialog(Config &config, Project &project, TQWidget *parent=0, const char *name=0);
 
 protected slots:
     void slotApply();
diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc
index f552de265..afa065912 100644
--- a/kplato/kptdatetable.cc
+++ b/kplato/kptdatetable.cc
@@ -41,8 +41,8 @@
 namespace KPlato
 {
 
-DateValidator::DateValidator(TQWidget* tqparent, const char* name)
-    : TQValidator(TQT_TQOBJECT(tqparent), name)
+DateValidator::DateValidator(TQWidget* parent, const char* name)
+    : TQValidator(TQT_TQOBJECT(parent), name)
 {
 }
 
@@ -73,8 +73,8 @@ DateValidator::fixup( TQString& ) const
 }
 
 
-DateTable::DateTable(TQWidget *tqparent, TQDate date_, const char* name, WFlags f)
-    : TQGridView(tqparent, name, f),
+DateTable::DateTable(TQWidget *parent, TQDate date_, const char* name, WFlags f)
+    : TQGridView(parent, name, f),
       m_enabled(true)
 {
     //kdDebug()<<k_funcinfo<<endl;
@@ -713,8 +713,8 @@ void DateTable::markSelected(int state) {
 }
 
 DateInternalWeekSelector::DateInternalWeekSelector
-(int fontsize, TQWidget* tqparent, const char* name)
-  : TQLineEdit(tqparent, name),
+(int fontsize, TQWidget* parent, const char* name)
+  : TQLineEdit(parent, name),
     val(new TQIntValidator(TQT_TQOBJECT(this))),
     result(0)
 {
@@ -761,8 +761,8 @@ DateInternalWeekSelector::setWeek(int week)
 }
 
 DateInternalMonthPicker::DateInternalMonthPicker
-(int fontsize, TQWidget* tqparent, const char* name)
-  : TQGridView(tqparent, name),
+(int fontsize, TQWidget* parent, const char* name)
+  : TQGridView(parent, name),
     result(0) // invalid
 {
   TQRect rect;
@@ -925,8 +925,8 @@ DateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e)
 
 
 DateInternalYearSelector::DateInternalYearSelector
-(int fontsize, TQWidget* tqparent, const char* name)
-  : TQLineEdit(tqparent, name),
+(int fontsize, TQWidget* parent, const char* name)
+  : TQLineEdit(parent, name),
     val(new TQIntValidator(TQT_TQOBJECT(this))),
     result(0)
 {
@@ -980,8 +980,8 @@ DateInternalYearSelector::setYear(int year)
   setText(temp);
 }
 
-PopupFrame::PopupFrame(TQWidget* tqparent, const char*  name)
-  : TQFrame(tqparent, name, WType_Popup),
+PopupFrame::PopupFrame(TQWidget* parent, const char*  name)
+  : TQFrame(parent, name, WType_Popup),
     result(0), // rejected
     main(0)
 {
diff --git a/kplato/kptdatetable.h b/kplato/kptdatetable.h
index 65e0d05f8..815a86e9c 100644
--- a/kplato/kptdatetable.h
+++ b/kplato/kptdatetable.h
@@ -57,7 +57,7 @@ signals:
   void closeMe(int);
 public:
   DateInternalWeekSelector(int fontsize,
-			    TQWidget* tqparent=0,
+			    TQWidget* parent=0,
 			    const char* name=0);
   int getWeek() const;
   void setWeek(int week);
@@ -100,7 +100,7 @@ public:
   /**
    * The constructor.
    */
-  DateInternalMonthPicker(int fontsize, TQWidget* tqparent, const char* name=0);
+  DateInternalMonthPicker(int fontsize, TQWidget* parent, const char* name=0);
   /**
    * The size hint.
    */
@@ -160,7 +160,7 @@ signals:
   void closeMe(int);
 public:
   DateInternalYearSelector(int fontsize,
-			    TQWidget* tqparent=0,
+			    TQWidget* parent=0,
 			    const char* name=0);
   int getYear() const;
   void setYear(int year);
@@ -202,7 +202,7 @@ public:
   /**
    * The contructor. Creates a dialog without buttons.
    */
-  PopupFrame(TQWidget* tqparent=0, const char*  name=0);
+  PopupFrame(TQWidget* parent=0, const char*  name=0);
   /**
    * Set the main widget. You cannot set the main widget from the constructor,
    * since it must be a child of the frame itselfes.
@@ -245,7 +245,7 @@ private:
 class DateValidator : public TQValidator
 {
 public:
-    DateValidator(TQWidget* tqparent=0, const char* name=0);
+    DateValidator(TQWidget* parent=0, const char* name=0);
     virtual State validate(TQString&, int&) const;
     virtual void fixup ( TQString & input ) const;
     State date(const TQString&, TQDate&) const;
@@ -260,7 +260,7 @@ public:
     /**
      * The constructor.
      */
-    DateTable(TQWidget *tqparent=0, TQDate date=TQDate::tqcurrentDate(),
+    DateTable(TQWidget *parent=0, TQDate date=TQDate::tqcurrentDate(),
                  const char* name="DateTable", WFlags f=0);
 
     /**
diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc
index 5eb411d86..2780d166e 100644
--- a/kplato/kptdoublelistviewbase.cc
+++ b/kplato/kptdoublelistviewbase.cc
@@ -88,8 +88,8 @@ void ListView::paintToPrinter(TQPainter * p, int cx, int cy, int cw, int ch) {
     p->restore();
 }
 
-DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListItem *master, TQListView *tqparent, TQListViewItem *after, bool highlight)
-    : KListViewItem(tqparent, after),
+DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListItem *master, TQListView *parent, TQListViewItem *after, bool highlight)
+    : KListViewItem(parent, after),
       m_masterItem(master),
       m_value(0.0),
       m_highlight(highlight),
@@ -98,10 +98,10 @@ DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListI
     setFormat();
     setExpandable(master->isExpandable());
     setOpen(master->isOpen());
-    //kdDebug()<<"DoubleListViewBase::SlaveListItem "<<master->text(0)<<" tqparent="<<static_cast<DoubleListViewBase::SlaveListItem*>(tqparent)->m_masterItem->text(0)<<endl;
+    //kdDebug()<<"DoubleListViewBase::SlaveListItem "<<master->text(0)<<" parent="<<static_cast<DoubleListViewBase::SlaveListItem*>(parent)->m_masterItem->text(0)<<endl;
 }
-DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListItem *master, TQListViewItem *tqparent, TQListViewItem *after, bool highlight)
-    : KListViewItem(tqparent, after),
+DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListItem *master, TQListViewItem *parent, TQListViewItem *after, bool highlight)
+    : KListViewItem(parent, after),
       m_masterItem(master),
       m_value(0.0),
       m_highlight(highlight),
@@ -110,7 +110,7 @@ DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListI
     setFormat();
     setExpandable(master->isExpandable());
     setOpen(master->isOpen());
-    //kdDebug()<<"DoubleListViewBase::SlaveListItem "<<master->text(0)<<" tqparent="<<static_cast<DoubleListViewBase::SlaveListItem*>(tqparent)->m_masterItem->text(0)<<endl;
+    //kdDebug()<<"DoubleListViewBase::SlaveListItem "<<master->text(0)<<" parent="<<static_cast<DoubleListViewBase::SlaveListItem*>(parent)->m_masterItem->text(0)<<endl;
 }
 DoubleListViewBase::SlaveListItem::~SlaveListItem() {
     //kdDebug()<<k_funcinfo<<endl;
@@ -161,8 +161,8 @@ void DoubleListViewBase::SlaveListItem::setFormat(int fieldwidth, char fmt, int
 }
 
 //----------------------------
-DoubleListViewBase::MasterListItem::MasterListItem(TQListView *tqparent, bool highlight)
-    : KListViewItem(tqparent),
+DoubleListViewBase::MasterListItem::MasterListItem(TQListView *parent, bool highlight)
+    : KListViewItem(parent),
       m_slaveItem(0),
       m_value(0.0),
       m_limit(0.0),
@@ -172,8 +172,8 @@ DoubleListViewBase::MasterListItem::MasterListItem(TQListView *tqparent, bool hi
     //kdDebug()<<k_funcinfo<<endl;
 }
 
-DoubleListViewBase::MasterListItem::MasterListItem(TQListView *tqparent, TQString text,   bool highlight)
-    : KListViewItem(tqparent, text),
+DoubleListViewBase::MasterListItem::MasterListItem(TQListView *parent, TQString text,   bool highlight)
+    : KListViewItem(parent, text),
       m_slaveItem(0),
       m_value(0.0),
       m_limit(0.0),
@@ -183,8 +183,8 @@ DoubleListViewBase::MasterListItem::MasterListItem(TQListView *tqparent, TQStrin
     //kdDebug()<<k_funcinfo<<endl;
 }
 
-DoubleListViewBase::MasterListItem::MasterListItem(TQListViewItem *tqparent, bool highlight)
-    : KListViewItem(tqparent),
+DoubleListViewBase::MasterListItem::MasterListItem(TQListViewItem *parent, bool highlight)
+    : KListViewItem(parent),
       m_slaveItem(0),
       m_value(0.0),
       m_limit(0.0),
@@ -194,8 +194,8 @@ DoubleListViewBase::MasterListItem::MasterListItem(TQListViewItem *tqparent, boo
     //kdDebug()<<k_funcinfo<<endl;
 }
 
-DoubleListViewBase::MasterListItem::MasterListItem(TQListViewItem *tqparent, TQString text,   bool highlight)
-    : KListViewItem(tqparent, text),
+DoubleListViewBase::MasterListItem::MasterListItem(TQListViewItem *parent, TQString text,   bool highlight)
+    : KListViewItem(parent, text),
       m_slaveItem(0),
       m_value(0.0),
       m_limit(0.0),
@@ -215,10 +215,10 @@ void DoubleListViewBase::MasterListItem::createSlaveItems(TQListView *lv, TQList
     if (m_slaveItem) {
         kdError()<<k_funcinfo<<"Slave item allready exists"<<endl;
     } else {
-        if (tqparent() == 0) {
+        if (parent() == 0) {
             m_slaveItem = new DoubleListViewBase::SlaveListItem(this, lv, after);
         } else {
-            m_slaveItem = new DoubleListViewBase::SlaveListItem(this, static_cast<DoubleListViewBase::MasterListItem*>(tqparent())->m_slaveItem, after);
+            m_slaveItem = new DoubleListViewBase::SlaveListItem(this, static_cast<DoubleListViewBase::MasterListItem*>(parent())->m_slaveItem, after);
         }
     }
     DoubleListViewBase::SlaveListItem *prev = 0;
@@ -342,8 +342,8 @@ void DoubleListViewBase::MasterListItem::setFormat(int fieldwidth, char fmt, int
 }
 
 //-------------------------------------
-DoubleListViewBase::DoubleListViewBase(TQWidget *tqparent, bool description)
-    : TQSplitter(tqparent),
+DoubleListViewBase::DoubleListViewBase(TQWidget *parent, bool description)
+    : TQSplitter(parent),
       m_fieldwidth(0),
       m_fmt('f'),
       m_prec(0) {
diff --git a/kplato/kptdoublelistviewbase.h b/kplato/kptdoublelistviewbase.h
index a92c4cb9e..aaaaf3059 100644
--- a/kplato/kptdoublelistviewbase.h
+++ b/kplato/kptdoublelistviewbase.h
@@ -41,8 +41,8 @@ class Project;
 class ListView : public KListView
 {
 public:
-    ListView(TQWidget *tqparent)
-    : KListView(tqparent)
+    ListView(TQWidget *parent)
+    : KListView(parent)
     {}
     
     virtual void paintToPrinter(TQPainter * p, int cx, int cy, int cw, int ch);
@@ -62,7 +62,7 @@ class DoubleListViewBase : public TQSplitter
   TQ_OBJECT
 public:
 
-    DoubleListViewBase(TQWidget *tqparent, bool description=false);
+    DoubleListViewBase(TQWidget *parent, bool description=false);
 
     //~DoubleListViewBase();
 
@@ -88,8 +88,8 @@ public:
     class MasterListItem;
     class SlaveListItem : public KListViewItem {
     public:
-        SlaveListItem(MasterListItem *master, TQListView *tqparent, TQListViewItem *after, bool highlight=false);
-        SlaveListItem(MasterListItem *master, TQListViewItem *tqparent, TQListViewItem *after, bool highlight=false);
+        SlaveListItem(MasterListItem *master, TQListView *parent, TQListViewItem *after, bool highlight=false);
+        SlaveListItem(MasterListItem *master, TQListViewItem *parent, TQListViewItem *after, bool highlight=false);
         ~SlaveListItem();
         void masterItemDeleted() { m_masterItem = 0; }
         
@@ -119,10 +119,10 @@ public:
 
     class MasterListItem : public KListViewItem {
     public:
-        MasterListItem(TQListView *tqparent, bool highlight=false);
-        MasterListItem(TQListView *tqparent, TQString text, bool highlight=false);
-        MasterListItem(TQListViewItem *tqparent, bool highlight=false);
-        MasterListItem(TQListViewItem *tqparent, TQString text, bool highlight=false);
+        MasterListItem(TQListView *parent, bool highlight=false);
+        MasterListItem(TQListView *parent, TQString text, bool highlight=false);
+        MasterListItem(TQListViewItem *parent, bool highlight=false);
+        MasterListItem(TQListViewItem *parent, TQString text, bool highlight=false);
         ~MasterListItem();
         
         /// Creates slaveitems for myself and my tqchildren
diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cc
index 0828ec039..e342da3e5 100644
--- a/kplato/kptfactory.cc
+++ b/kplato/kptfactory.cc
@@ -34,8 +34,8 @@ K_EXPORT_COMPONENT_FACTORY( libkplatopart, Factory )
 KInstance* Factory::s_global = 0L;
 KAboutData* Factory::s_aboutData = 0L;
 
-Factory::Factory( TQObject* tqparent, const char* name )
-    : KoFactory( tqparent, name )
+Factory::Factory( TQObject* parent, const char* name )
+    : KoFactory( parent, name )
 {
     global();
 }
@@ -50,7 +50,7 @@ Factory::~Factory()
 
 KParts::Part *Factory::createPartObject(TQWidget *parentWidget,
 					   const char *widgetName,
-					   TQObject* tqparent, const char* name,
+					   TQObject* parent, const char* name,
 					   const char* classname,
 					   const TQStringList &)
 {
@@ -61,7 +61,7 @@ KParts::Part *Factory::createPartObject(TQWidget *parentWidget,
 
     // parentWidget and widgetName are used by KoDocument for the
     // "readonly+singleView" case.
-    Part *part = new Part(parentWidget, widgetName, tqparent, name,
+    Part *part = new Part(parentWidget, widgetName, parent, name,
 				!bWantKoDocument);
 
     if (!bWantKoDocument)
diff --git a/kplato/kptfactory.h b/kplato/kptfactory.h
index 8a8022af8..a10a7da67 100644
--- a/kplato/kptfactory.h
+++ b/kplato/kptfactory.h
@@ -32,10 +32,10 @@ class Factory : public KoFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    Factory( TQObject* tqparent = 0, const char* name = 0 );
+    Factory( TQObject* parent = 0, const char* name = 0 );
     ~Factory();
 
-    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc
index 376953201..925598f9a 100644
--- a/kplato/kptganttview.cc
+++ b/kplato/kptganttview.cc
@@ -70,16 +70,16 @@ namespace KPlato
 
 class MyKDGanttView : public KDGanttView {
 public:
-    MyKDGanttView(TQWidget *tqparent, const char *name)
-    : KDGanttView(tqparent, name) {
+    MyKDGanttView(TQWidget *parent, const char *name)
+    : KDGanttView(parent, name) {
     }
     virtual TQSize tqsizeHint() const {
         return tqminimumSizeHint(); //HACK: koshell splitter tqminimumSize problem
     }
 };
 
-GanttView::GanttView(TQWidget *tqparent, bool readWrite, const char* name)
-    : TQSplitter(tqparent, name),
+GanttView::GanttView(TQWidget *parent, bool readWrite, const char* name)
+    : TQSplitter(parent, name),
     m_readWrite(readWrite),
     m_currentItem(0),
     m_taskView(0),
@@ -344,8 +344,8 @@ void GanttView::removeNotDrawn(KDGanttViewItem *_item)
 void GanttView::deleteItem(KDGanttViewItem *item)
 {
     //kdDebug()<<k_funcinfo<<item->listViewText()<<endl;
-    if (item->tqparent())
-        item->tqparent()->takeItem(item);
+    if (item->parent())
+        item->parent()->takeItem(item);
     else
         item->listView()->takeItem(item);
     delete item;
@@ -375,7 +375,7 @@ KDGanttViewItem *GanttView::correctType(KDGanttViewItem *item, Node *node)
             return item;
             break;
     }
-    KDGanttViewItem *newItem = addNode(item->tqparent(), node, item);
+    KDGanttViewItem *newItem = addNode(item->parent(), node, item);
     newItem->setOpen(item->isOpen());
     deleteItem(item);
     return newItem;
@@ -392,7 +392,7 @@ void GanttView::correctPosition(KDGanttViewItem *item, Node *node)
 KDGanttViewItem *GanttView::correctParent(KDGanttViewItem *item, Node *node)
 {
     KDGanttViewItem *p = findItem(node->getParent());
-    if (p == item->tqparent()) {
+    if (p == item->parent()) {
         return item;
     }
     KDGanttViewItem *newItem = addNode(p, node);
diff --git a/kplato/kptganttview.h b/kplato/kptganttview.h
index 42f1ac1d7..353dbff84 100644
--- a/kplato/kptganttview.h
+++ b/kplato/kptganttview.h
@@ -59,7 +59,7 @@ class GanttView : public TQSplitter
 
  public:
 
-    GanttView(TQWidget *tqparent, bool readWrite=true, const char* name = 0  );
+    GanttView(TQWidget *parent, bool readWrite=true, const char* name = 0  );
 
     //~GanttView();
 
diff --git a/kplato/kptintervaledit.cc b/kplato/kptintervaledit.cc
index 7985d7db4..a76a15462 100644
--- a/kplato/kptintervaledit.cc
+++ b/kplato/kptintervaledit.cc
@@ -37,16 +37,16 @@
 namespace KPlato
 {
 
-IntervalEdit::IntervalEdit(TQWidget *tqparent, const char *name)
-    : IntervalEditImpl(tqparent)
+IntervalEdit::IntervalEdit(TQWidget *parent, const char *name)
+    : IntervalEditImpl(parent)
 {
     //kdDebug()<<k_funcinfo<<endl;
 
 }
 
 //--------------------------------------------
-IntervalEditImpl::IntervalEditImpl(TQWidget *tqparent)
-    : IntervalEditBase(tqparent) {
+IntervalEditImpl::IntervalEditImpl(TQWidget *parent)
+    : IntervalEditBase(parent) {
 
     intervalList->header()->setStretchEnabled(true);
     intervalList->setSortColumn(0);
diff --git a/kplato/kptintervaledit.h b/kplato/kptintervaledit.h
index 0d889241c..0550b9f59 100644
--- a/kplato/kptintervaledit.h
+++ b/kplato/kptintervaledit.h
@@ -36,7 +36,7 @@ class IntervalEditImpl : public IntervalEditBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    IntervalEditImpl(TQWidget *tqparent);
+    IntervalEditImpl(TQWidget *parent);
     
     TQPtrList<TQPair<TQTime, TQTime> > intervals() const;
     void setIntervals(const TQPtrList<TQPair<TQTime, TQTime> > &intervals) const;
@@ -54,7 +54,7 @@ class IntervalEdit : public IntervalEditImpl {
     Q_OBJECT
   TQ_OBJECT
 public:
-    IntervalEdit(TQWidget *tqparent=0, const char *name=0);
+    IntervalEdit(TQWidget *parent=0, const char *name=0);
     
 };
 
diff --git a/kplato/kptmainprojectdialog.cc b/kplato/kptmainprojectdialog.cc
index 71e2ba4e5..a9f40ae0c 100644
--- a/kplato/kptmainprojectdialog.cc
+++ b/kplato/kptmainprojectdialog.cc
@@ -31,8 +31,8 @@
 namespace KPlato
 {
 
-MainProjectDialog::MainProjectDialog(Project &p, TQWidget *tqparent, const char *name)
-    : KDialogBase( Swallow, i18n("Project Settings"), Ok|Cancel, Ok, tqparent, name, true, true),
+MainProjectDialog::MainProjectDialog(Project &p, TQWidget *parent, const char *name)
+    : KDialogBase( Swallow, i18n("Project Settings"), Ok|Cancel, Ok, parent, name, true, true),
       project(p)
 {
     panel = new MainProjectPanel(project, this);
diff --git a/kplato/kptmainprojectdialog.h b/kplato/kptmainprojectdialog.h
index 4930e9ae3..dadd29b40 100644
--- a/kplato/kptmainprojectdialog.h
+++ b/kplato/kptmainprojectdialog.h
@@ -36,7 +36,7 @@ class MainProjectDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    MainProjectDialog(Project &project, TQWidget *tqparent=0, const char *name=0);
+    MainProjectDialog(Project &project, TQWidget *parent=0, const char *name=0);
 
     KCommand *buildCommand(Part *part);
     
diff --git a/kplato/kptmainprojectpanel.cc b/kplato/kptmainprojectpanel.cc
index 402bdc4ab..222ca0a9c 100644
--- a/kplato/kptmainprojectpanel.cc
+++ b/kplato/kptmainprojectpanel.cc
@@ -45,8 +45,8 @@
 namespace KPlato
 {
 
-MainProjectPanel::MainProjectPanel(Project &p, TQWidget *tqparent, const char *name)
-    : MainProjectPanelImpl(tqparent, name),
+MainProjectPanel::MainProjectPanel(Project &p, TQWidget *parent, const char *name)
+    : MainProjectPanelImpl(parent, name),
       project(p)
 {
     namefield->setText(project.name());
@@ -142,8 +142,8 @@ KCommand *MainProjectPanel::buildCommand(Part *part) {
 }
 
 //-------------------------------------------------------------------
-MainProjectPanelImpl::MainProjectPanelImpl(TQWidget *tqparent, const char *name)
-    :  MainProjectPanelBase(tqparent, name) {
+MainProjectPanelImpl::MainProjectPanelImpl(TQWidget *parent, const char *name)
+    :  MainProjectPanelBase(parent, name) {
 
     // signals and slots connections
     connect( bStartDate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotStartDateClicked() ) );
diff --git a/kplato/kptmainprojectpanel.h b/kplato/kptmainprojectpanel.h
index 50043a3fb..7a32b578f 100644
--- a/kplato/kptmainprojectpanel.h
+++ b/kplato/kptmainprojectpanel.h
@@ -38,7 +38,7 @@ class MainProjectPanelImpl : public MainProjectPanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    MainProjectPanelImpl(TQWidget *tqparent=0, const char *name=0);
+    MainProjectPanelImpl(TQWidget *parent=0, const char *name=0);
 
     virtual TQDateTime startDateTime();
     virtual TQDateTime endDateTime();
@@ -61,7 +61,7 @@ class MainProjectPanel : public MainProjectPanelImpl {
     Q_OBJECT
   TQ_OBJECT
 public:
-    MainProjectPanel(Project &project, TQWidget *tqparent=0, const char *name=0);
+    MainProjectPanel(Project &project, TQWidget *parent=0, const char *name=0);
 
     KCommand *buildCommand(Part *part);
     
diff --git a/kplato/kptmilestoneprogressdialog.h b/kplato/kptmilestoneprogressdialog.h
index 9cff7dba7..28f13969e 100644
--- a/kplato/kptmilestoneprogressdialog.h
+++ b/kplato/kptmilestoneprogressdialog.h
@@ -35,7 +35,7 @@ class MilestoneProgressDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    MilestoneProgressDialog(Task &task, TQWidget *tqparent=0);
+    MilestoneProgressDialog(Task &task, TQWidget *parent=0);
 
     KCommand *buildCommand(Part *part);
 
diff --git a/kplato/kptmilestoneprogresspanel.cc b/kplato/kptmilestoneprogresspanel.cc
index 14e83b064..b5c1af0a6 100644
--- a/kplato/kptmilestoneprogresspanel.cc
+++ b/kplato/kptmilestoneprogresspanel.cc
@@ -34,8 +34,8 @@
 namespace KPlato
 {
 
-MilestoneProgressPanel::MilestoneProgressPanel(Task &task, TQWidget *tqparent, const char *name)
-    : MilestoneProgressPanelImpl(tqparent, name),
+MilestoneProgressPanel::MilestoneProgressPanel(Task &task, TQWidget *parent, const char *name)
+    : MilestoneProgressPanelImpl(parent, name),
       m_task(task)
 {
     kdDebug()<<k_funcinfo<<endl;
@@ -68,8 +68,8 @@ KCommand *MilestoneProgressPanel::buildCommand(Part *part) {
 
 //-------------------------------------
 
-MilestoneProgressPanelImpl::MilestoneProgressPanelImpl(TQWidget *tqparent, const char *name, WFlags f)
-    : MilestoneProgressPanelBase(tqparent, name, f) {
+MilestoneProgressPanelImpl::MilestoneProgressPanelImpl(TQWidget *parent, const char *name, WFlags f)
+    : MilestoneProgressPanelBase(parent, name, f) {
     
     connect(finished, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFinishedChanged(bool)));
     connect(finished, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
diff --git a/kplato/kptmilestoneprogresspanel.h b/kplato/kptmilestoneprogresspanel.h
index 4129e80c2..24dfd060d 100644
--- a/kplato/kptmilestoneprogresspanel.h
+++ b/kplato/kptmilestoneprogresspanel.h
@@ -35,7 +35,7 @@ class MilestoneProgressPanelImpl : public MilestoneProgressPanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    MilestoneProgressPanelImpl(TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+    MilestoneProgressPanelImpl(TQWidget *parent=0, const char *name=0, WFlags f=0);
     
     void enableWidgets();
 
@@ -51,7 +51,7 @@ class MilestoneProgressPanel : public MilestoneProgressPanelImpl {
     Q_OBJECT
   TQ_OBJECT
 public:
-    MilestoneProgressPanel(Task &task, TQWidget *tqparent=0, const char *name=0);
+    MilestoneProgressPanel(Task &task, TQWidget *parent=0, const char *name=0);
 
     KCommand *buildCommand(Part *part);
     
diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc
index aaa770f0f..1da218e68 100644
--- a/kplato/kptnode.cc
+++ b/kplato/kptnode.cc
@@ -34,19 +34,19 @@
 namespace KPlato
 {
 
-Node::Node(Node *tqparent) : m_nodes(), m_dependChildNodes(), m_dependParentNodes() {
+Node::Node(Node *parent) : m_nodes(), m_dependChildNodes(), m_dependParentNodes() {
     //kdDebug()<<k_funcinfo<<"("<<this<<")"<<endl;
-    m_parent = tqparent;
+    m_parent = parent;
     init();
     m_id = TQString(); // Not mapped
 }
 
-Node::Node(Node &node, Node *tqparent) 
+Node::Node(Node &node, Node *parent) 
     : m_nodes(), 
       m_dependChildNodes(), 
       m_dependParentNodes() {
     //kdDebug()<<k_funcinfo<<"("<<this<<")"<<endl;
-    m_parent = tqparent;
+    m_parent = parent;
     init();
     m_name = node.name();
     m_leader = node.leader();
@@ -113,7 +113,7 @@ Node *Node::projectNode() {
     if (m_parent)
         return m_parent->projectNode();
 
-    kdError()<<k_funcinfo<<"Ooops, no tqparent and no project found"<<endl;
+    kdError()<<k_funcinfo<<"Ooops, no parent and no project found"<<endl;
     return 0;
 }
 
@@ -313,7 +313,7 @@ bool Node::isParentOf(Node *node) {
 Relation *Node::findParentRelation(Node *node) {
     for (int i=0; i<numDependParentNodes(); i++) {
         Relation *rel = getDependParentNode(i);
-        if (rel->tqparent() == node)
+        if (rel->parent() == node)
             return rel;
     }
     return (Relation *)0;
@@ -339,9 +339,9 @@ bool Node::isDependChildOf(Node *node) {
     //kdDebug()<<k_funcinfo<<" '"<<m_name<<"' checking against '"<<node->name()<<"'"<<endl;
     for (int i=0; i<numDependParentNodes(); i++) {
         Relation *rel = getDependParentNode(i);
-        if (rel->tqparent() == node)
+        if (rel->parent() == node)
             return true;
-		if (rel->tqparent()->isDependChildOf(node))
+		if (rel->parent()->isDependChildOf(node))
 		    return true;
     }
 	return false;
@@ -652,7 +652,7 @@ bool Node::addAppointment(Appointment *appointment, Schedule &main) {
 void Node::addAppointment(ResourceSchedule *resource, DateTime &start, DateTime &end, double load) {
     Schedule *node = findSchedule(resource->id());
     if (node == 0) {
-        node = createSchedule(resource->tqparent());
+        node = createSchedule(resource->parent());
     }
     node->addAppointment(resource, start, end, load);
 }
@@ -678,9 +678,9 @@ Schedule *Node::createSchedule(TQString name, Schedule::Type type, long id) {
     return sch;
 }
 
-Schedule *Node::createSchedule(Schedule *tqparent) {
+Schedule *Node::createSchedule(Schedule *parent) {
     //kdDebug()<<k_funcinfo<<name<<" type="<<type<<" id="<<(int)id<<endl;
-    NodeSchedule *sch = new NodeSchedule(tqparent, this);
+    NodeSchedule *sch = new NodeSchedule(parent, this);
     addSchedule(sch);
     return sch;
 }
@@ -743,7 +743,7 @@ bool Node::calcCriticalPath(bool fromEnd) {
     }
     TQPtrListIterator<Relation> pit(m_dependParentNodes);
     for (; pit.current(); ++pit) {
-        if (pit.current()->tqparent()->calcCriticalPath(fromEnd)) {
+        if (pit.current()->parent()->calcCriticalPath(fromEnd)) {
             m_currentSchedule->inCriticalPath = true;
         }
     }
diff --git a/kplato/kptnode.h b/kplato/kptnode.h
index d6a6bbef1..95d7c24b7 100644
--- a/kplato/kptnode.h
+++ b/kplato/kptnode.h
@@ -59,8 +59,8 @@ class Node {
 public:
     enum ConstraintType { ASAP, ALAP, MustStartOn, MustFinishOn, StartNotEarlier, FinishNotLater, FixedInterval };
 
-    Node(Node *tqparent = 0);
-    Node(Node &node, Node *tqparent = 0);
+    Node(Node *parent = 0);
+    Node(Node &node, Node *parent = 0);
 
 
     // Declare the class abstract
@@ -374,7 +374,7 @@ public:
     virtual bool legalToLink(Node *, Node *) { return false; }
     /// Check if this node has any dependent child nodes
     virtual bool isEndNode() const;
-    /// Check if this node has any dependent tqparent nodes
+    /// Check if this node has any dependent parent nodes
     virtual bool isStartNode() const;
     virtual void clearProxyRelations() {}
     virtual void addParentProxyRelations(TQPtrList<Relation> &) {}
@@ -477,11 +477,11 @@ public:
     /// Create a new schedule.
     Schedule *createSchedule(TQString name, Schedule::Type type, long id);
     /// Create a new schedule.
-    Schedule *createSchedule(Schedule *tqparent);
+    Schedule *createSchedule(Schedule *parent);
     
     /// Set deleted = onoff for schedule with id
     void setScheduleDeleted(long id, bool onoff);
-    /// Set tqparent schedule recursivly
+    /// Set parent schedule recursivly
     virtual void setParentSchedule(Schedule *sch);
     
     DateTime startTime()
diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc
index f3075f372..e442c048f 100644
--- a/kplato/kptpart.cc
+++ b/kplato/kptpart.cc
@@ -49,8 +49,8 @@ namespace KPlato
 {
 
 Part::Part(TQWidget *parentWidget, const char *widgetName,
-		 TQObject *tqparent, const char *name, bool singleViewMode)
-    : KoDocument(parentWidget, widgetName, tqparent, name, singleViewMode),
+		 TQObject *parent, const char *name, bool singleViewMode)
+    : KoDocument(parentWidget, widgetName, parent, name, singleViewMode),
       m_project(0), m_projectDialog(0), m_parentWidget(parentWidget), m_view(0),
       m_embeddedGanttView(new GanttView(parentWidget)),
       m_embeddedContext(new Context()), m_embeddedContextInitialized(false),
@@ -141,12 +141,12 @@ bool Part::initDoc(InitDocFlags flags, TQWidget* parentWidget) {
 }
 
 
-KoView *Part::createViewInstance(TQWidget *tqparent, const char *name) {
-    m_view = new View(this, tqparent, name);
+KoView *Part::createViewInstance(TQWidget *parent, const char *name) {
+    m_view = new View(this, parent, name);
     connect(m_view,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotViewDestroyed()));
 
     // If there is a project dialog this should be deleted so it will
-    // use the m_view as tqparent. If the dialog will be needed again,
+    // use the m_view as parent. If the dialog will be needed again,
     // it will be made at that point
     if (m_projectDialog != 0) {
 	kdDebug() << "Deleting m_projectDialog because of new ViewInstance\n";
@@ -169,13 +169,13 @@ KoView *Part::createViewInstance(TQWidget *tqparent, const char *name) {
 
 void Part::editProject() {
 
-    TQWidget* tqparent = m_parentWidget;
+    TQWidget* parent = m_parentWidget;
     if (m_view)
-      tqparent = m_view;
+      parent = m_view;
       
     if (m_projectDialog == 0)
 	// Make the dialog
-	m_projectDialog = new ProjectDialog(*m_project, tqparent);
+	m_projectDialog = new ProjectDialog(*m_project, parent);
 
     m_projectDialog->exec();
 }
diff --git a/kplato/kptpart.h b/kplato/kptpart.h
index 25ba542e5..1eab7bdd4 100644
--- a/kplato/kptpart.h
+++ b/kplato/kptpart.h
@@ -50,7 +50,7 @@ class Part : public KoDocument, public KoTextZoomHandler {
 
 public:
     Part(TQWidget *parentWidget = 0, const char *widgetName = 0,
-	    TQObject* tqparent = 0, const char* name = 0,
+	    TQObject* parent = 0, const char* name = 0,
 	    bool singleViewMode = false);
     ~Part();
 
@@ -86,7 +86,7 @@ public:
     
     const XMLLoaderObject &xmlLoader() const { return m_xmlLoader; }
 protected:
-    virtual KoView* createViewInstance(TQWidget* tqparent, const char* name);
+    virtual KoView* createViewInstance(TQWidget* parent, const char* name);
 
 protected slots:
     void slotDocumentRestored();
diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc
index e269c6ed9..b1f49afb7 100644
--- a/kplato/kptpertcanvas.cc
+++ b/kplato/kptpertcanvas.cc
@@ -48,8 +48,8 @@
 namespace KPlato
 {
 
-PertCanvas::PertCanvas( TQWidget *tqparent )
-    : TQCanvasView( tqparent, "Pert canvas" /*WNorthWestGravity WStaticContents| WResizeNoErase | WRepaintNoErase */),
+PertCanvas::PertCanvas( TQWidget *parent )
+    : TQCanvasView( parent, "Pert canvas" /*WNorthWestGravity WStaticContents| WResizeNoErase | WRepaintNoErase */),
 	m_verticalGap(20),
 	m_horizontalGap(10),
 	m_itemSize(100,30)
@@ -153,7 +153,7 @@ void PertCanvas::drawRelations()
     TQPtrListIterator<Relation> it(m_relations);
     for (; it.current(); ++it)
     {
-        PertNodeItem *parentItem = m_nodes.find(it.current()->tqparent());
+        PertNodeItem *parentItem = m_nodes.find(it.current()->parent());
         PertNodeItem *childItem = m_nodes.find(it.current()->child());
         if (parentItem && childItem)
         {
@@ -192,7 +192,7 @@ void PertCanvas::mapChildNode(PertNodeItem *parentItem, PertNodeItem *childItem,
     if (type == Relation::StartStart ||
         type == Relation::FinishFinish)
     {
-        // node goes into row below tqparent, at least same col
+        // node goes into row below parent, at least same col
         if (chMapped)
         {
             m_rows.at(chRow)->at(chCol) = false;
diff --git a/kplato/kptpertcanvas.h b/kplato/kptpertcanvas.h
index 437bb6fa3..58b31a012 100644
--- a/kplato/kptpertcanvas.h
+++ b/kplato/kptpertcanvas.h
@@ -43,7 +43,7 @@ class PertCanvas : public TQCanvasView
   TQ_OBJECT
 
 public:
-    PertCanvas( TQWidget *tqparent );
+    PertCanvas( TQWidget *parent );
     virtual ~PertCanvas();
 
     void draw(Project& project);
diff --git a/kplato/kptpertview.cc b/kplato/kptpertview.cc
index 3bd376365..02830d37f 100644
--- a/kplato/kptpertview.cc
+++ b/kplato/kptpertview.cc
@@ -40,8 +40,8 @@
 namespace KPlato
 {
 
-PertView::PertView( View *view, TQWidget *tqparent, TQLayout *tqlayout )
-    : TQWidget( tqparent, "Pert view" ),
+PertView::PertView( View *view, TQWidget *parent, TQLayout *tqlayout )
+    : TQWidget( parent, "Pert view" ),
     m_mainview( view ),
     m_node( 0 )
 {
diff --git a/kplato/kptpertview.h b/kplato/kptpertview.h
index ed4e3c28d..b98b2cae9 100644
--- a/kplato/kptpertview.h
+++ b/kplato/kptpertview.h
@@ -44,7 +44,7 @@ class PertView : public TQWidget
     
 public:
  
-    PertView( View *view, TQWidget *tqparent, TQLayout *tqlayout );
+    PertView( View *view, TQWidget *parent, TQLayout *tqlayout );
 
     ~PertView();
     
diff --git a/kplato/kptproject.cc b/kplato/kptproject.cc
index d06c5e51c..9379de4ab 100644
--- a/kplato/kptproject.cc
+++ b/kplato/kptproject.cc
@@ -42,8 +42,8 @@ namespace KPlato
 {
 
 
-Project::Project(Node *tqparent)
-    : Node(tqparent),
+Project::Project(Node *parent)
+    : Node(parent),
       m_accounts(*this),
       m_baselined(false) {
     //kdDebug()<<k_funcinfo<<"("<<this<<")"<<endl;
@@ -55,7 +55,7 @@ Project::Project(Node *tqparent)
 
 void Project::init() {
     if (m_parent == 0) {
-        // set sensible defaults for a project wo tqparent
+        // set sensible defaults for a project wo parent
         m_constraintStartTime = TQDateTime(TQDate::tqcurrentDate(), TQTime());
         m_constraintEndTime = TQDateTime(m_constraintStartTime.addDays(1));
     }
@@ -173,7 +173,7 @@ Duration *Project::getRandomDuration() {
 DateTime Project::calculateForward(int use) {
     //kdDebug()<<k_funcinfo<<m_name<<endl;
     if (type() == Node::Type_Project) {
-        // Follow *tqparent* relations back and
+        // Follow *parent* relations back and
         // calculate forwards following the child relations
         DateTime finish;
         DateTime time;
@@ -195,7 +195,7 @@ DateTime Project::calculateBackward(int use) {
     //kdDebug()<<k_funcinfo<<m_name<<endl;
     if (type() == Node::Type_Project) {
         // Follow *child* relations back and
-        // calculate backwards following tqparent relation
+        // calculate backwards following parent relation
         DateTime start;
         DateTime time;
         TQPtrListIterator<Node> startnodes = m_startNodes;
@@ -441,7 +441,7 @@ bool Project::load(TQDomElement &element) {
     TQPtrListIterator<Calendar> calit(m_calendars);
     for (; calit.current(); ++calit) {
         if (calit.current()->id() == calit.current()->parentId()) {
-            kdError()<<k_funcinfo<<"Calendar want itself as tqparent"<<endl;
+            kdError()<<k_funcinfo<<"Calendar want itself as parent"<<endl;
             continue;
         }
         calit.current()->setParent(calendar(calit.current()->parentId()));
@@ -491,7 +491,7 @@ void Project::save(TQDomElement &element)  const {
         git.current()->save(me);
     }
 
-    // Only save tqparent relations
+    // Only save parent relations
     TQPtrListIterator<Relation> it(m_dependParentNodes);
     for ( ; it.current(); ++it ) {
         it.current()->save(me);
@@ -568,10 +568,10 @@ bool Project::addTask( Node* task, Node* position )
         return addSubTask(task, position);
 	}
 	// find the position
-	// we have to tell the tqparent that we want to delete one of its tqchildren
+	// we have to tell the parent that we want to delete one of its tqchildren
 	Node* parentNode = position->getParent();
 	if ( !parentNode ) {
-		kdDebug()<<k_funcinfo<<"tqparent node not found???"<<endl;
+		kdDebug()<<k_funcinfo<<"parent node not found???"<<endl;
 		return false;
 	}
 	int index = parentNode->findChildNode( position );
@@ -588,7 +588,7 @@ bool Project::addSubTask( Node* task, Node* position )
 	// we want to add a subtask to the node "position". It will become
 	// position's last child.
 	if ( 0 == position ) {
-        kdError()<<k_funcinfo<<"No tqparent, can not add subtask: "<<task->name()<<endl;
+        kdError()<<k_funcinfo<<"No parent, can not add subtask: "<<task->name()<<endl;
         return false;
     }
     if (!registerNodeId(task)) {
@@ -599,30 +599,30 @@ bool Project::addSubTask( Node* task, Node* position )
     return true;
 }
 
-bool Project::addSubTask( Node* task, int index, Node* tqparent )
+bool Project::addSubTask( Node* task, int index, Node* parent )
 {
-    // we want to add a subtask to the node "tqparent" at the given index.
-    if ( 0 == tqparent ) {
-        kdError()<<k_funcinfo<<"No tqparent, can not add subtask: "<<task->name()<<endl;
+    // we want to add a subtask to the node "parent" at the given index.
+    if ( 0 == parent ) {
+        kdError()<<k_funcinfo<<"No parent, can not add subtask: "<<task->name()<<endl;
         return false;
     }
     if (!registerNodeId(task)) {
         kdError()<<k_funcinfo<<"Failed to register node id, can not add subtask: "<<task->name()<<endl;
         return false;
     }
-    tqparent->insertChildNode(index, task);
+    parent->insertChildNode(index, task);
     return true;
 }
 
 void Project::delTask(Node *node)
 {
-    Node *tqparent = node->getParent();
-    if (tqparent == 0) {
-        kdDebug()<<k_funcinfo<<"Node must have a tqparent!"<<endl;
+    Node *parent = node->getParent();
+    if (parent == 0) {
+        kdDebug()<<k_funcinfo<<"Node must have a parent!"<<endl;
         return;
     }
     removeId(node->id());
-    tqparent->delChildNode(node, false/*take*/);
+    parent->delChildNode(node, false/*take*/);
 }
 
 bool Project::canIndentTask(Node* node)
@@ -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 tqparent of task to manipulate its list of tqchildren
+    // we have to find the parent of task to manipulate its list of tqchildren
     Node* parentNode = node->getParent();
     if ( !parentNode ) {
         return false;
@@ -647,11 +647,11 @@ bool Project::canIndentTask(Node* node)
     }
     Node *sib = node->siblingBefore();
     if (!sib) {
-        //kdDebug()<<k_funcinfo<<"new tqparent node not found"<<endl;
+        //kdDebug()<<k_funcinfo<<"new parent node not found"<<endl;
         return false;
     }
     if (node->findParentRelation(sib) || node->findChildRelation(sib)) {
-        //kdDebug()<<k_funcinfo<<"Cannot have relations to tqparent"<<endl;
+        //kdDebug()<<k_funcinfo<<"Cannot have relations to parent"<<endl;
         return false;
     }
     return true;
@@ -679,8 +679,8 @@ bool Project::canUnindentTask( Node* node )
         //kdDebug()<<k_funcinfo<<"The root node cannot be unindented"<<endl;
         return false;
     }
-    // we have to find the tqparent of task to manipulate its list of tqchildren
-    // and we need the tqparent's tqparent too
+    // 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 ) {
         return false;
@@ -714,10 +714,10 @@ bool Project::canMoveTaskUp( Node* node )
 {
     if (node == 0)
         return false; // safety
-    // we have to find the tqparent of task to manipulate its list of tqchildren
+    // we have to find the parent of task to manipulate its list of tqchildren
     Node* parentNode = node->getParent();
     if (!parentNode) {
-        //kdDebug()<<k_funcinfo<<"No tqparent found"<<endl;
+        //kdDebug()<<k_funcinfo<<"No parent found"<<endl;
         return false;
     }
     if (parentNode->findChildNode(node) == -1) {
@@ -742,7 +742,7 @@ bool Project::canMoveTaskDown( Node* node )
 {
     if (node == 0)
         return false; // safety
-    // we have to find the tqparent of task to manipulate its list of tqchildren
+    // we have to find the parent of task to manipulate its list of tqchildren
     Node* parentNode = node->getParent();
     if (!parentNode) {
         return false;
@@ -765,14 +765,14 @@ bool Project::moveTaskDown( Node* node )
     return false;
 }
 
-Task *Project::createTask(Node* tqparent) {
-    Task* node = new Task(tqparent);
+Task *Project::createTask(Node* parent) {
+    Task* node = new Task(parent);
     node->setId(uniqueNodeId());
     return node;
 }
 
-Task *Project::createTask(Task &def, Node* tqparent) {
-    Task* node = new Task(def, tqparent);
+Task *Project::createTask(Task &def, Node* parent) {
+    Task* node = new Task(def, parent);
     node->setId(uniqueNodeId());
     return node;
 }
@@ -1009,7 +1009,7 @@ bool Project::legalParents(Node *par, Node *child) {
     bool legal = true;
     //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)->tqparent();
+        Node *pNode = par->getDependParentNode(i)->parent();
         if (child->isParentOf(pNode) || pNode->isParentOf(child)) {
             //kdDebug()<<k_funcinfo<<"Found: "<<pNode->name()<<" is related to "<<child->name()<<endl;
             legal = false;
diff --git a/kplato/kptproject.h b/kplato/kptproject.h
index edfa83d16..14f03384f 100644
--- a/kplato/kptproject.h
+++ b/kplato/kptproject.h
@@ -51,7 +51,7 @@ class StandardWorktime;
  */
 class Project : public Node {
 public:
-    Project(Node *tqparent = 0);
+    Project(Node *parent = 0);
     ~Project();
 
     /// Returns the node type. Can be Type_Project or Type_Subproject.
@@ -100,7 +100,7 @@ public:
 
     bool addTask( Node* task, Node* position );
     bool addSubTask( Node* task, Node* position );
-    bool addSubTask( Node* task, int index, Node* tqparent );
+    bool addSubTask( Node* task, int index, Node* parent );
     void delTask(Node *node);
     bool canIndentTask(Node* node);
     bool indentTask( Node* node );
@@ -110,8 +110,8 @@ public:
     bool moveTaskUp( Node* node );
     bool canMoveTaskDown( Node* node );
     bool moveTaskDown( Node* node );
-    Task *createTask(Node* tqparent);
-    Task *createTask(Task &def, Node* tqparent);
+    Task *createTask(Node* parent);
+    Task *createTask(Task &def, Node* parent);
     
     /// Returns the resourcegroup with identity id.
     ResourceGroup *group(TQString id);
@@ -227,7 +227,7 @@ public:
     virtual void setCurrentSchedule(long id);
     /// Create new schedule with unique id.
     MainSchedule *createSchedule(TQString name, Schedule::Type type);
-    /// Set tqparent schedule for my tqchildren
+    /// Set parent schedule for my tqchildren
     virtual void setParentSchedule(Schedule *sch);
     
 protected:
diff --git a/kplato/kptprojectdialog.cc b/kplato/kptprojectdialog.cc
index add74c8e4..a45bddf29 100644
--- a/kplato/kptprojectdialog.cc
+++ b/kplato/kptprojectdialog.cc
@@ -44,8 +44,8 @@
 namespace KPlato
 {
 
-ProjectDialog::ProjectDialog(Project &p, TQWidget *tqparent, const char *name)
-    : KDialogBase( Swallow, i18n("Project Settings"), Ok|Cancel, Ok, tqparent, name, true, true),
+ProjectDialog::ProjectDialog(Project &p, TQWidget *parent, const char *name)
+    : KDialogBase( Swallow, i18n("Project Settings"), Ok|Cancel, Ok, parent, name, true, true),
       project(p)
 {
     dia = new ProjectDialogImpl(this);
@@ -117,7 +117,7 @@ void ProjectDialog::slotSchedulingChanged(int activated) {
     dia->lSchedulingExplain->setText(label);
 }
 
-ProjectDialogImpl::ProjectDialogImpl (TQWidget *tqparent) : ProjectDialogBase(tqparent) {
+ProjectDialogImpl::ProjectDialogImpl (TQWidget *parent) : ProjectDialogBase(parent) {
     connect (namefield, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotCheckAllFieldsFilled()) );
     connect (leaderfield, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotCheckAllFieldsFilled()) );
     connect (schedulerType, TQT_SIGNAL(activated( int )), this, TQT_SLOT(slotSchedulingChanged( int )) );
diff --git a/kplato/kptprojectdialog.h b/kplato/kptprojectdialog.h
index 0f9cc95e2..e2655b1ad 100644
--- a/kplato/kptprojectdialog.h
+++ b/kplato/kptprojectdialog.h
@@ -39,7 +39,7 @@ class ProjectDialogImpl : public ProjectDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    ProjectDialogImpl (TQWidget *tqparent);
+    ProjectDialogImpl (TQWidget *parent);
 
 private slots:
     void slotCheckAllFieldsFilled();
@@ -55,7 +55,7 @@ class ProjectDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    ProjectDialog(Project &project, TQWidget *tqparent=0,
+    ProjectDialog(Project &project, TQWidget *parent=0,
 		     const char *name=0);
 
 
diff --git a/kplato/kptrelation.cc b/kplato/kptrelation.cc
index 3814c51cd..e84b72a29 100644
--- a/kplato/kptrelation.cc
+++ b/kplato/kptrelation.cc
@@ -31,29 +31,29 @@
 namespace KPlato
 {
 
-Relation::Relation(Node *tqparent, Node *child, Type type, Duration lag) {
-    m_parent=tqparent;
+Relation::Relation(Node *parent, Node *child, Type type, Duration lag) {
+    m_parent=parent;
     m_child=child;
     m_type=type;
     m_lag=lag;
 }
 
-Relation::Relation(Node *tqparent, Node *child, Type type) {
-    m_parent=tqparent;
+Relation::Relation(Node *parent, Node *child, Type type) {
+    m_parent=parent;
     m_child=child;
     m_type=type;
     m_lag=Duration();
 }
 
 Relation::Relation(Relation *rel) {
-    m_parent=rel->tqparent();
+    m_parent=rel->parent();
     m_child=rel->child();
     m_type=rel->type();
     m_lag=rel->lag();
 }
 
 Relation::~Relation() {
-    //kdDebug()<<k_funcinfo<<"tqparent: "<<(m_parent ? m_parent->name():"none")<<" child: "<<(m_child ? m_child->name():"None")<<endl;
+    //kdDebug()<<k_funcinfo<<"parent: "<<(m_parent ? m_parent->name():"none")<<" child: "<<(m_child ? m_child->name():"None")<<endl;
     if (m_parent)
         m_parent->takeDependChildNode(this);
     if (m_child)
@@ -66,7 +66,7 @@ void Relation::setType(Type type) {
 
 
 bool Relation::load(TQDomElement &element, Project &project) {
-    m_parent = project.findNode(element.attribute("tqparent-id"));
+    m_parent = project.findNode(element.attribute("parent-id"));
     if (m_parent == 0) {
         return false;
     }
@@ -75,7 +75,7 @@ bool Relation::load(TQDomElement &element, Project &project) {
         return false;
     }
     if (m_child == m_parent) {
-        kdDebug()<<k_funcinfo<<"child == tqparent"<<endl;
+        kdDebug()<<k_funcinfo<<"child == parent"<<endl;
         return false;
     }
     if (!m_parent->legalToLink(m_child))
@@ -94,16 +94,16 @@ bool Relation::load(TQDomElement &element, Project &project) {
     m_lag = Duration::fromString(element.attribute("lag"));
 
     if (!m_parent->addDependChildNode(this)) {
-        kdError()<<k_funcinfo<<"Failed to add relation: Child="<<m_child->name()<<" tqparent="<<m_parent->name()<<endl;
+        kdError()<<k_funcinfo<<"Failed to add relation: Child="<<m_child->name()<<" parent="<<m_parent->name()<<endl;
         return false;
     }
     if (!m_child->addDependParentNode(this)) {
         m_parent->delDependChildNode(this, false/*do not delete*/);
-        kdError()<<k_funcinfo<<"Failed to add relation: Child="<<m_child->name()<<" tqparent="<<m_parent->name()<<endl;
+        kdError()<<k_funcinfo<<"Failed to add relation: Child="<<m_child->name()<<" parent="<<m_parent->name()<<endl;
         return false;
     }
 
-    //kdDebug()<<k_funcinfo<<"Added relation: Child="<<m_child->name()<<" tqparent="<<m_parent->name()<<endl;
+    //kdDebug()<<k_funcinfo<<"Added relation: Child="<<m_child->name()<<" parent="<<m_parent->name()<<endl;
     return true;
 }
 
@@ -112,7 +112,7 @@ void Relation::save(TQDomElement &element) const {
     TQDomElement me = element.ownerDocument().createElement("relation");
     element.appendChild(me);
 
-    me.setAttribute("tqparent-id", m_parent->id());
+    me.setAttribute("parent-id", m_parent->id());
     me.setAttribute("child-id", m_child->id());
     TQString type = "Finish-Start";
     switch (m_type) {
diff --git a/kplato/kptrelation.h b/kplato/kptrelation.h
index 35c2869a1..c84b7cf88 100644
--- a/kplato/kptrelation.h
+++ b/kplato/kptrelation.h
@@ -46,13 +46,13 @@ class Relation {
 public:
     enum Type { FinishStart, FinishFinish, StartStart };
 
-    Relation(Node *tqparent, Node *child, Type type, Duration lag);
-    Relation(Node *tqparent=0, Node *child=0, Type type=FinishStart);
+    Relation(Node *parent, Node *child, Type type, Duration lag);
+    Relation(Node *parent=0, Node *child=0, Type type=FinishStart);
     Relation(Relation *rel);
     
     /** 
     *  When deleted the relation will remove itself from 
-    *  the tqparent- and child nodes lists
+    *  the parent- and child nodes lists
     */
     virtual ~Relation();
 
@@ -60,16 +60,16 @@ public:
     Type type() const { return m_type; }
 
     /** returns the lag.
-    *  The lag of a relation is the time it takes between the tqparent starting/stopping
+    *  The lag of a relation is the time it takes between the parent starting/stopping
     *  and the start of the child.
     */
     const Duration &lag() const { return m_lag; }
     void setLag(Duration lag) { m_lag = lag; }
 
     /**
-     * @return The tqparent dependent node.
+     * @return The parent dependent node.
      */
-    Node *tqparent() const { return m_parent; }
+    Node *parent() const { return m_parent; }
     /**
      * @return The child dependent node.
      */
@@ -103,8 +103,8 @@ public:
 class ProxyRelation : public Relation
 {
 public:
-    ProxyRelation(Node *tqparent, Node *child, Relation::Type type, Duration lag) 
-    : Relation(tqparent, child, type, lag) 
+    ProxyRelation(Node *parent, Node *child, Relation::Type type, Duration lag) 
+    : Relation(parent, child, type, lag) 
     {}
 
     ~ProxyRelation() { m_parent = 0; m_child = 0;}
diff --git a/kplato/kptrelationdialog.cc b/kplato/kptrelationdialog.cc
index 938496b0b..c79adb6f4 100644
--- a/kplato/kptrelationdialog.cc
+++ b/kplato/kptrelationdialog.cc
@@ -49,7 +49,7 @@ AddRelationDialog::AddRelationDialog(Relation *rel, TQWidget *p, TQString captio
     setMainWidget(m_panel);
     m_panel->setActiveWindow();
     
-    m_panel->fromName->setText(rel->tqparent()->name());
+    m_panel->fromName->setText(rel->parent()->name());
     m_panel->toName->setText(rel->child()->name());
     m_panel->relationType->setButton(rel->type());
     
diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc
index 3cecf3eb4..655d19071 100644
--- a/kplato/kptreportview.cc
+++ b/kplato/kptreportview.cc
@@ -158,8 +158,8 @@ public:
 
 class KugarReportViewer : public Kugar::MReportViewer {
 public:
-    KugarReportViewer(TQWidget *tqparent = 0, const char *name = 0)
-    : MReportViewer(tqparent, name)
+    KugarReportViewer(TQWidget *parent = 0, const char *name = 0)
+    : MReportViewer(parent, name)
     {}
     
     int currentPage() {
@@ -170,8 +170,8 @@ public:
     }
 };
 
-ReportView::ReportView(View *view, TQWidget *tqparent)
-    : TQSplitter(tqparent),
+ReportView::ReportView(View *view, TQWidget *parent)
+    : TQSplitter(parent),
     m_mainview(view),
     m_reportTags(0)
 {
diff --git a/kplato/kptreportview.h b/kplato/kptreportview.h
index 8dd023e2d..24e28c08e 100644
--- a/kplato/kptreportview.h
+++ b/kplato/kptreportview.h
@@ -59,7 +59,7 @@ class ReportView : public TQSplitter
 
  public:
 
-    ReportView(View *view, TQWidget *tqparent);
+    ReportView(View *view, TQWidget *parent);
 
     ~ReportView();
 
diff --git a/kplato/kptrequestresourcespanel.cc b/kplato/kptrequestresourcespanel.cc
index 0b1f77402..d65f86e72 100644
--- a/kplato/kptrequestresourcespanel.cc
+++ b/kplato/kptrequestresourcespanel.cc
@@ -71,8 +71,8 @@ void ResourceTableItem::insert(TQTable *table, int row) {
     //kdDebug()<<k_funcinfo<<"Added: '"<<m_resource->name()<<"' checked="<<m_checked<<endl;
 }
 
-GroupLVItem::GroupLVItem(TQListView *tqparent, ResourceGroup *group, Task &task)
-    : TQListViewItem(tqparent, group->name(), TQString("%1").tqarg(group->units())),
+GroupLVItem::GroupLVItem(TQListView *parent, ResourceGroup *group, Task &task)
+    : TQListViewItem(parent, group->name(), TQString("%1").tqarg(group->units())),
       m_group(group),
       m_units(0)
 {
@@ -147,8 +147,8 @@ bool GroupLVItem::isNull() const {
     return true;
 }
 
-RequestResourcesPanel::RequestResourcesPanel(TQWidget *tqparent, Task &task, bool baseline)
-    : TaskResourcesPanelBase(tqparent),
+RequestResourcesPanel::RequestResourcesPanel(TQWidget *parent, Task &task, bool baseline)
+    : TaskResourcesPanelBase(parent),
       m_task(task),
       m_worktime(0),
       selectedGroup(0),
diff --git a/kplato/kptrequestresourcespanel.h b/kplato/kptrequestresourcespanel.h
index ada8ef100..c9259ea5e 100644
--- a/kplato/kptrequestresourcespanel.h
+++ b/kplato/kptrequestresourcespanel.h
@@ -72,7 +72,7 @@ public:
 
 class GroupLVItem : public TQListViewItem {
 public:
-    GroupLVItem(TQListView *tqparent, ResourceGroup *group, Task &task);
+    GroupLVItem(TQListView *parent, ResourceGroup *group, Task &task);
     ~GroupLVItem();
 
     void update();
@@ -94,7 +94,7 @@ class RequestResourcesPanel : public TaskResourcesPanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    RequestResourcesPanel(TQWidget *tqparent, Task &task, bool baseline=false);
+    RequestResourcesPanel(TQWidget *parent, Task &task, bool baseline=false);
 
     KCommand *buildCommand(Part *part);
     
diff --git a/kplato/kptresource.cc b/kplato/kptresource.cc
index 1b732e879..448074aed 100644
--- a/kplato/kptresource.cc
+++ b/kplato/kptresource.cc
@@ -231,7 +231,7 @@ Resource::~Resource() {
     }
     m_requests.first();
     for (; m_requests.current(); m_requests.next()) {
-        m_requests.current()->tqparent()->removeResourceRequest(m_requests.current()); // deletes the request
+        m_requests.current()->parent()->removeResourceRequest(m_requests.current()); // deletes the request
     }
 }
 
@@ -432,7 +432,7 @@ void Resource::addAppointment(Schedule *node, DateTime &start, DateTime &end, do
     //kdDebug()<<k_funcinfo<<endl;
     Schedule *s = findSchedule(node->id());
     if (s == 0) {
-        s = createSchedule(node->tqparent());
+        s = createSchedule(node->parent());
     }
     s->addAppointment(node, start, end, load);
 }
@@ -466,8 +466,8 @@ ResourceSchedule *Resource::createSchedule(TQString name, int type, long id) {
     return sch;
 }
 
-ResourceSchedule *Resource::createSchedule(Schedule *tqparent) {
-    ResourceSchedule *sch = new ResourceSchedule(tqparent, this);
+ResourceSchedule *Resource::createSchedule(Schedule *parent) {
+    ResourceSchedule *sch = new ResourceSchedule(parent, this);
     addSchedule(sch);
     return sch;
 }
diff --git a/kplato/kptresource.h b/kplato/kptresource.h
index e298a0223..d4930f2fa 100644
--- a/kplato/kptresource.h
+++ b/kplato/kptresource.h
@@ -322,7 +322,7 @@ public:
     void takeSchedule(const Schedule *schedule);
     void addSchedule(Schedule *schedule);
     ResourceSchedule *createSchedule(TQString name, int type, long id);
-    ResourceSchedule *createSchedule(Schedule *tqparent);
+    ResourceSchedule *createSchedule(Schedule *parent);
     
 protected:
     void makeAppointment(Schedule *node, const DateTime &from, const DateTime &end);
@@ -394,8 +394,8 @@ class ResourceRequest {
 
         ~ResourceRequest();
 
-        ResourceGroupRequest *tqparent() const { return m_parent; }
-        void setParent(ResourceGroupRequest *tqparent) { m_parent = tqparent; }
+        ResourceGroupRequest *parent() const { return m_parent; }
+        void setParent(ResourceGroupRequest *parent) { m_parent = parent; }
         
         Resource *resource() const { return m_resource; }
         void setResource(Resource* resource) { m_resource = resource; }
@@ -438,8 +438,8 @@ class ResourceGroupRequest {
         ResourceGroupRequest(ResourceGroup *group=0, int units=0);
         ~ResourceGroupRequest();
 
-        void setParent(ResourceRequestCollection *tqparent) { m_parent = tqparent;}
-        ResourceRequestCollection *tqparent() const { return m_parent; }
+        void setParent(ResourceRequestCollection *parent) { m_parent = parent;}
+        ResourceRequestCollection *parent() const { return m_parent; }
         
         ResourceGroup *group() const { return m_group; }
         TQPtrList<ResourceRequest> &resourceRequests() { return m_resourceRequests; }
diff --git a/kplato/kptresourceappointmentsview.cc b/kplato/kptresourceappointmentsview.cc
index 3768ebefa..4b6d7a446 100644
--- a/kplato/kptresourceappointmentsview.cc
+++ b/kplato/kptresourceappointmentsview.cc
@@ -36,8 +36,8 @@
 namespace KPlato
 {
 
-ResourceAppointmentsView::NodeItem::NodeItem(Node *t, TQListView *tqparent, bool highlight)
-    : DoubleListViewBase::MasterListItem(tqparent, t->name(), highlight),
+ResourceAppointmentsView::NodeItem::NodeItem(Node *t, TQListView *parent, bool highlight)
+    : DoubleListViewBase::MasterListItem(parent, t->name(), highlight),
       node(t) {
       
       setFormat(0, 'f', 1);
@@ -51,16 +51,16 @@ ResourceAppointmentsView::NodeItem::NodeItem(Node *t, TQListViewItem *p, bool hi
     //kdDebug()<<k_funcinfo<<endl;
 }
 
-ResourceAppointmentsView::NodeItem::NodeItem(TQString text, TQListViewItem *tqparent, bool highlight)
-    : DoubleListViewBase::MasterListItem(tqparent, text, highlight),
+ResourceAppointmentsView::NodeItem::NodeItem(TQString text, TQListViewItem *parent, bool highlight)
+    : DoubleListViewBase::MasterListItem(parent, text, highlight),
       node(0) {
       
       setFormat(0, 'f', 1);
     //kdDebug()<<k_funcinfo<<endl;
 }
 
-ResourceAppointmentsView::NodeItem::NodeItem(TQString text, TQListView *tqparent, bool highlight)
-    : DoubleListViewBase::MasterListItem(tqparent, text, highlight),
+ResourceAppointmentsView::NodeItem::NodeItem(TQString text, TQListView *parent, bool highlight)
+    : DoubleListViewBase::MasterListItem(parent, text, highlight),
       node(0) {
       
       setFormat(0, 'f', 1);
@@ -68,8 +68,8 @@ ResourceAppointmentsView::NodeItem::NodeItem(TQString text, TQListView *tqparent
 }
 
 //-------------------------------------------
-ResourceAppointmentsView::ResourceAppointmentsView(View *view, TQWidget *tqparent)
-    : DoubleListViewBase(tqparent),
+ResourceAppointmentsView::ResourceAppointmentsView(View *view, TQWidget *parent)
+    : DoubleListViewBase(parent),
       m_mainview(view),
       m_resource(0),
       m_availItem(0),
diff --git a/kplato/kptresourceappointmentsview.h b/kplato/kptresourceappointmentsview.h
index c3ddcbb6d..e6b52546f 100644
--- a/kplato/kptresourceappointmentsview.h
+++ b/kplato/kptresourceappointmentsview.h
@@ -54,7 +54,7 @@ class ResourceAppointmentsView : public DoubleListViewBase
   TQ_OBJECT
 public:
 
-    ResourceAppointmentsView(View *view, TQWidget *tqparent);
+    ResourceAppointmentsView(View *view, TQWidget *parent);
 
     //~ResourceAppointmentsView();
 
@@ -77,10 +77,10 @@ protected slots:
 private:
     class NodeItem : public DoubleListViewBase::MasterListItem {
     public:
-        NodeItem(Node *n, TQListView *tqparent, bool highlight=false);
-        NodeItem(Node *n, TQListViewItem *tqparent, bool highlight=false);
-        NodeItem(TQString text, TQListView *tqparent, bool highlight=false);
-        NodeItem(TQString text, TQListViewItem *tqparent, bool highlight=false);
+        NodeItem(Node *n, TQListView *parent, bool highlight=false);
+        NodeItem(Node *n, TQListViewItem *parent, bool highlight=false);
+        NodeItem(TQString text, TQListView *parent, bool highlight=false);
+        NodeItem(TQString text, TQListViewItem *parent, bool highlight=false);
         
         Node *node;
         EffortCostMap effortMap;
diff --git a/kplato/kptresourcedialog.cc b/kplato/kptresourcedialog.cc
index b67116a17..4746f1fcb 100644
--- a/kplato/kptresourcedialog.cc
+++ b/kplato/kptresourcedialog.cc
@@ -49,8 +49,8 @@
 namespace KPlato
 {
 
-ResourceDialogImpl::ResourceDialogImpl (TQWidget *tqparent)
-    : ResourceDialogBase(tqparent)
+ResourceDialogImpl::ResourceDialogImpl (TQWidget *parent)
+    : ResourceDialogBase(parent)
 {
 
     connect(type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
@@ -118,8 +118,8 @@ void ResourceDialogImpl::slotChooseResource()
 
 //////////////////  ResourceDialog  ////////////////////////
 
-ResourceDialog::ResourceDialog(Project &project, Resource *resource, TQWidget *tqparent, const char *name)
-    : KDialogBase( Swallow, i18n("Resource Settings"), Ok|Cancel, Ok, tqparent, name, true, true),
+ResourceDialog::ResourceDialog(Project &project, Resource *resource, TQWidget *parent, const char *name)
+    : KDialogBase( Swallow, i18n("Resource Settings"), Ok|Cancel, Ok, parent, name, true, true),
       m_original(resource),
       m_resource(resource),
       m_calculationNeeded(false)
diff --git a/kplato/kptresourcedialog.h b/kplato/kptresourcedialog.h
index ef4b8d12b..673b27e80 100644
--- a/kplato/kptresourcedialog.h
+++ b/kplato/kptresourcedialog.h
@@ -45,7 +45,7 @@ class ResourceDialogImpl : public ResourceDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    ResourceDialogImpl (TQWidget *tqparent);
+    ResourceDialogImpl (TQWidget *parent);
 
 public slots:
     void slotChanged();
@@ -65,7 +65,7 @@ class ResourceDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    ResourceDialog(Project &project, Resource *resource, TQWidget *tqparent=0, const char *name=0);
+    ResourceDialog(Project &project, Resource *resource, TQWidget *parent=0, const char *name=0);
 
     bool calculationNeeded() {  return m_calculationNeeded; }
 
diff --git a/kplato/kptresourcesdialog.cc b/kplato/kptresourcesdialog.cc
index 784f8e4ee..032fcd0fb 100644
--- a/kplato/kptresourcesdialog.cc
+++ b/kplato/kptresourcesdialog.cc
@@ -32,8 +32,8 @@
 namespace KPlato
 {
 
-ResourcesDialog::ResourcesDialog(Project &p, TQWidget *tqparent, const char *name)
-    : KDialogBase( Swallow, i18n("Resources"), Ok|Cancel, Ok, tqparent, name, true, true),
+ResourcesDialog::ResourcesDialog(Project &p, TQWidget *parent, const char *name)
+    : KDialogBase( Swallow, i18n("Resources"), Ok|Cancel, Ok, parent, name, true, true),
       project(p)
 {
     panel = new ResourcesPanel(this, &project);
diff --git a/kplato/kptresourcesdialog.h b/kplato/kptresourcesdialog.h
index 2f7c43d70..687344272 100644
--- a/kplato/kptresourcesdialog.h
+++ b/kplato/kptresourcesdialog.h
@@ -36,7 +36,7 @@ class ResourcesDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    ResourcesDialog(Project &project, TQWidget *tqparent=0, const char *name=0);
+    ResourcesDialog(Project &project, TQWidget *parent=0, const char *name=0);
 
     KCommand *buildCommand(Part *part);
     
diff --git a/kplato/kptresourcespanel.cc b/kplato/kptresourcespanel.cc
index 29b1d4eb1..99443d884 100644
--- a/kplato/kptresourcespanel.cc
+++ b/kplato/kptresourcespanel.cc
@@ -225,7 +225,7 @@ protected:
 
 ////////////////////   ResourcesPanel   //////////////////////
 
-ResourcesPanel::ResourcesPanel(TQWidget *tqparent, Project *p) : ResourcesPanelBase(tqparent) {
+ResourcesPanel::ResourcesPanel(TQWidget *parent, Project *p) : ResourcesPanelBase(parent) {
     project = p;
     m_groupItem = 0;
     m_blockResourceRename = false;
diff --git a/kplato/kptresourcespanel.h b/kplato/kptresourcespanel.h
index 9324fd9b8..44b2a39e5 100644
--- a/kplato/kptresourcespanel.h
+++ b/kplato/kptresourcespanel.h
@@ -42,7 +42,7 @@ class ResourcesPanel : public ResourcesPanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    ResourcesPanel (TQWidget *tqparent, Project *project);
+    ResourcesPanel (TQWidget *parent, Project *project);
     
     bool ok();
     KCommand *buildCommand(Part *part);
diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc
index 13306105c..d596ff444 100644
--- a/kplato/kptresourceview.cc
+++ b/kplato/kptresourceview.cc
@@ -48,8 +48,8 @@ namespace KPlato
 
 class ResListView : public KListView {
 public:
-    ResListView(TQWidget * tqparent = 0, const char* name=0)
-    : KListView(tqparent, name)
+    ResListView(TQWidget * parent = 0, const char* name=0)
+    : KListView(parent, name)
     {}
 
     int headerHeight() const {
@@ -280,8 +280,8 @@ protected:
 
 class ResourceItemPrivate : public KListViewItem {
 public:
-    ResourceItemPrivate(Resource *r, TQListViewItem *tqparent)
-        : KListViewItem(tqparent, r->name()),
+    ResourceItemPrivate(Resource *r, TQListViewItem *parent)
+        : KListViewItem(parent, r->name()),
         resource(r) {}
 
     Resource *resource;
@@ -304,14 +304,14 @@ private:
 
 class NodeItemPrivate : public KListViewItem {
 public:
-    NodeItemPrivate(Task *n, TQListView *tqparent)
-    : KListViewItem(tqparent, n->name()),
+    NodeItemPrivate(Task *n, TQListView *parent)
+    : KListViewItem(parent, n->name()),
       node(n) {
         init();
     }
 
-    NodeItemPrivate(TQString name, TQListView *tqparent)
-    : KListViewItem(tqparent, name),
+    NodeItemPrivate(TQString name, TQListView *parent)
+    : KListViewItem(parent, name),
       node(0) {
         init();
     }
@@ -353,8 +353,8 @@ private:
 
 class AppointmentItem : public KListViewItem {
 public:
-    AppointmentItem(Appointment *a, TQDate &d, TQListViewItem *tqparent)
-        : KListViewItem(tqparent),
+    AppointmentItem(Appointment *a, TQDate &d, TQListViewItem *parent)
+        : KListViewItem(parent),
         appointment(a),
         date(d) {}
 
@@ -366,8 +366,8 @@ TQSize ResourceView::tqsizeHint() const {
     return tqminimumSizeHint(); // HACK: koshell splitter tqminimumSize problem
 }
 
-ResourceView::ResourceView(View *view, TQWidget *tqparent)
-    : TQSplitter(tqparent, "Resource view"),
+ResourceView::ResourceView(View *view, TQWidget *parent)
+    : TQSplitter(parent, "Resource view"),
     m_mainview(view),
     m_selectedItem(0),
     m_currentNode(0)
@@ -444,13 +444,13 @@ void ResourceView::draw(Project &project)
 }
 
 
-void ResourceView::drawResources(const Project &proj, TQListViewItem *tqparent, ResourceGroup *group)
+void ResourceView::drawResources(const Project &proj, TQListViewItem *parent, ResourceGroup *group)
 {
     //kdDebug()<<k_funcinfo<<"group: "<<group->name()<<" ("<<group<<")"<<endl;
     TQPtrListIterator<Resource> it(group->resources());
     for (; it.current(); ++it) {
         Resource *r = it.current();
-        ResourceItemPrivate *item = new ResourceItemPrivate(r, tqparent);
+        ResourceItemPrivate *item = new ResourceItemPrivate(r, parent);
         // set column colors
         item->setColumnState(0, 0);
         item->setColumnState(4, 0);
diff --git a/kplato/kptresourceview.h b/kplato/kptresourceview.h
index 5fb3d98ad..b3049ed37 100644
--- a/kplato/kptresourceview.h
+++ b/kplato/kptresourceview.h
@@ -52,7 +52,7 @@ class ResourceItemPrivate;
   TQ_OBJECT
 
  public:
-    ResourceView(View *view, TQWidget *tqparent);
+    ResourceView(View *view, TQWidget *parent);
 
     //~ResourceView();
 
@@ -86,7 +86,7 @@ protected slots:
     void popupMenuRequested(TQListViewItem * item, const TQPoint & pos, int);
 
 private:
-    void drawResources(const Project &proj, TQListViewItem *tqparent, ResourceGroup *group);
+    void drawResources(const Project &proj, TQListViewItem *parent, ResourceGroup *group);
 
 private:
 	View *m_mainview;
diff --git a/kplato/kptschedule.cc b/kplato/kptschedule.cc
index 3187a2e19..6c478042b 100644
--- a/kplato/kptschedule.cc
+++ b/kplato/kptschedule.cc
@@ -41,17 +41,17 @@ Schedule::Schedule()
       m_parent(0) {
 }
 
-Schedule::Schedule(Schedule *tqparent)
+Schedule::Schedule(Schedule *parent)
     : m_type(Expected),
       m_id(0),
       m_deleted(false),
       m_appointments(),
-      m_parent(tqparent) {
+      m_parent(parent) {
 
-    if (tqparent) {
-        m_name = tqparent->name();
-        m_type = tqparent->type();
-        m_id = tqparent->id();
+    if (parent) {
+        m_name = parent->name();
+        m_type = parent->type();
+        m_id = parent->id();
     }
     m_appointments.setAutoDelete(true);
     //kdDebug()<<k_funcinfo<<"("<<this<<") Name: '"<<name<<"' Type="<<type<<" id="<<id<<endl;
@@ -72,8 +72,8 @@ Schedule::Schedule(TQString name, Type type, long id)
 Schedule::~Schedule() {
 }
 
-void Schedule::setParent(Schedule *tqparent) {
-    m_parent = tqparent;
+void Schedule::setParent(Schedule *parent) {
+    m_parent = parent;
 }
 
 void Schedule::setDeleted(bool on) {
@@ -357,8 +357,8 @@ NodeSchedule::NodeSchedule(Node *node, TQString name, Schedule::Type type, long
     init();
 }
 
-NodeSchedule::NodeSchedule(Schedule *tqparent, Node *node)
-    : Schedule(tqparent),
+NodeSchedule::NodeSchedule(Schedule *parent, Node *node)
+    : Schedule(parent),
       m_node(node) {
     
     //kdDebug()<<k_funcinfo<<"node name: "<<node->name()<<endl;
@@ -484,10 +484,10 @@ ResourceSchedule::ResourceSchedule(Resource *resource, TQString name, Schedule::
     //kdDebug()<<k_funcinfo<<"resource: "<<resource->name()<<endl;
 }
 
-ResourceSchedule::ResourceSchedule(Schedule *tqparent, Resource *resource)
-    : Schedule(tqparent),
+ResourceSchedule::ResourceSchedule(Schedule *parent, Resource *resource)
+    : Schedule(parent),
       m_resource(resource),
-      m_parent(tqparent) {
+      m_parent(parent) {
     //kdDebug()<<k_funcinfo<<"resource: "<<resource->name()<<endl;
 }
 
@@ -615,10 +615,10 @@ void NodeSchedule::printDebug(TQString indent) {
     Schedule::printDebug(indent);
     indent += "!  ";
     if (m_parent == 0)
-        kdDebug()<<indent<<"No tqparent schedule!"<<endl;
+        kdDebug()<<indent<<"No parent schedule!"<<endl;
     if (!notScheduled) {
         if (node()) kdDebug()<<indent<<"Node: "<<node()->name()<<endl;
-        else kdDebug()<<indent<<"No tqparent node!"<<endl;
+        else kdDebug()<<indent<<"No parent node!"<<endl;
     }
     kdDebug()<<indent<<"Not scheduled="<<notScheduled<<endl;
     kdDebug()<<indent<<"Start time: "<<startTime.toString()<<endl;
@@ -648,9 +648,9 @@ void ResourceSchedule::printDebug(TQString indent) {
     Schedule::printDebug(indent);
     indent += "!  ";
     if (m_parent == 0)
-        kdDebug()<<indent<<"No tqparent schedule!"<<endl;
+        kdDebug()<<indent<<"No parent schedule!"<<endl;
     if (resource()) kdDebug()<<indent<<"Resource: "<<resource()->name()<<endl;
-    else kdDebug()<<indent<<"No tqparent resource!"<<endl;
+    else kdDebug()<<indent<<"No parent resource!"<<endl;
     kdDebug()<<indent<<endl;
     kdDebug()<<indent<<"Appointments: "<<m_appointments.count()<<endl;
 }
@@ -659,7 +659,7 @@ void MainSchedule::printDebug(TQString indent) {
     Schedule::printDebug(indent);
     indent += "!  ";
     if (node()) kdDebug()<<indent<<"Node: "<<node()->name()<<endl;
-    else kdDebug()<<indent<<"No tqparent node!"<<endl;
+    else kdDebug()<<indent<<"No parent node!"<<endl;
     
     kdDebug()<<indent<<"Not scheduled="<<notScheduled<<endl;
     kdDebug()<<indent<<"Start time: "<<startTime.toString()<<endl;
diff --git a/kplato/kptschedule.h b/kplato/kptschedule.h
index e1525c790..f43805065 100644
--- a/kplato/kptschedule.h
+++ b/kplato/kptschedule.h
@@ -61,7 +61,7 @@ public:
     };
     
     Schedule();
-    Schedule(Schedule *tqparent);
+    Schedule(Schedule *parent);
     Schedule(TQString name, Type type, long id);
     ~Schedule();
     
@@ -73,8 +73,8 @@ public:
     TQString typeToString(bool translate=false) const;
     long id() const { return m_id; }
     void setId(long id) { m_id = id; }
-    void setParent(Schedule *tqparent);
-    Schedule *tqparent() const { return m_parent; }
+    void setParent(Schedule *parent);
+    Schedule *parent() const { return m_parent; }
     virtual bool isDeleted() const;
     virtual void setDeleted(bool on);
     
@@ -235,7 +235,7 @@ class NodeSchedule : public Schedule
 public:
     NodeSchedule();
     NodeSchedule(Node *node, TQString name, Schedule::Type type, long id);
-    NodeSchedule(Schedule *tqparent, Node *node);
+    NodeSchedule(Schedule *parent, Node *node);
     ~NodeSchedule();
     
     virtual bool isDeleted() const 
@@ -272,7 +272,7 @@ class ResourceSchedule : public Schedule
 public:
     ResourceSchedule();
     ResourceSchedule(Resource *Resource, TQString name, Schedule::Type type, long id);
-    ResourceSchedule(Schedule *tqparent, Resource *Resource);
+    ResourceSchedule(Schedule *parent, Resource *Resource);
     ~ResourceSchedule();
     
     virtual bool isDeleted() const 
diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cc
index 3e7fb267c..fb5a9c0ea 100644
--- a/kplato/kptstandardworktimedialog.cc
+++ b/kplato/kptstandardworktimedialog.cc
@@ -49,8 +49,8 @@ namespace KPlato
 class WeekdayListItem : public KListViewItem
 {
 public:
-    WeekdayListItem(Calendar *cal, int wd, KListView *tqparent, TQString name, KListViewItem *after)
-    : KListViewItem(tqparent, after),
+    WeekdayListItem(Calendar *cal, int wd, KListView *parent, TQString name, KListViewItem *after)
+    : KListViewItem(parent, after),
       original(cal->weekday(wd)),
       calendar(cal),
       weekday(wd)
@@ -92,8 +92,8 @@ public:
     int weekday;
 };
 
-StandardWorktimeDialog::StandardWorktimeDialog(Project &p, TQWidget *tqparent, const char *name)
-    : KDialogBase( Swallow, i18n("Standard Worktime"), Ok|Cancel, Ok, tqparent, name, true, true),
+StandardWorktimeDialog::StandardWorktimeDialog(Project &p, TQWidget *parent, const char *name)
+    : KDialogBase( Swallow, i18n("Standard Worktime"), Ok|Cancel, Ok, parent, name, true, true),
       project(p)
 {
     //kdDebug()<<k_funcinfo<<&p<<endl;
@@ -144,8 +144,8 @@ void StandardWorktimeDialog::slotOk() {
 }
 
 
-StandardWorktimeDialogImpl::StandardWorktimeDialogImpl(StandardWorktime *std, TQWidget *tqparent) 
-    : StandardWorktimeDialogBase(tqparent),
+StandardWorktimeDialogImpl::StandardWorktimeDialogImpl(StandardWorktime *std, TQWidget *parent) 
+    : StandardWorktimeDialogBase(parent),
       m_std(std) {
     if (!std) {
         m_std = new StandardWorktime();
diff --git a/kplato/kptstandardworktimedialog.h b/kplato/kptstandardworktimedialog.h
index 81bc2ce78..e65f31e8c 100644
--- a/kplato/kptstandardworktimedialog.h
+++ b/kplato/kptstandardworktimedialog.h
@@ -40,7 +40,7 @@ class StandardWorktimeDialogImpl : public StandardWorktimeDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    StandardWorktimeDialogImpl ( StandardWorktime *std, TQWidget *tqparent);
+    StandardWorktimeDialogImpl ( StandardWorktime *std, TQWidget *parent);
 
     StandardWorktime *standardWorktime() { return m_std; }
     double inYear() const { return m_year; }
@@ -78,7 +78,7 @@ class StandardWorktimeDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    StandardWorktimeDialog(Project &project, TQWidget *tqparent=0, const char *name=0);
+    StandardWorktimeDialog(Project &project, TQWidget *parent=0, const char *name=0);
     
     KMacroCommand *buildCommand(Part *part);
 
diff --git a/kplato/kptsummarytaskdialog.h b/kplato/kptsummarytaskdialog.h
index d1607783a..90b45cd9d 100644
--- a/kplato/kptsummarytaskdialog.h
+++ b/kplato/kptsummarytaskdialog.h
@@ -55,9 +55,9 @@ public:
     /**
      * The constructor for the summary task settings dialog.
      * @param task the task to edit
-     * @param tqparent tqparent widget
+     * @param parent parent widget
      */
-    SummaryTaskDialog(Task &task,  TQWidget *tqparent=0);
+    SummaryTaskDialog(Task &task,  TQWidget *parent=0);
 
     KCommand *buildCommand(Part *part);
 
diff --git a/kplato/kptsummarytaskgeneralpanel.h b/kplato/kptsummarytaskgeneralpanel.h
index 615556c41..e5f3740a0 100644
--- a/kplato/kptsummarytaskgeneralpanel.h
+++ b/kplato/kptsummarytaskgeneralpanel.h
@@ -35,7 +35,7 @@ class SummaryTaskGeneralPanel : public SummaryTaskGeneralPanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    SummaryTaskGeneralPanel(Task &task, TQWidget *tqparent=0, const char *name=0);
+    SummaryTaskGeneralPanel(Task &task, TQWidget *parent=0, const char *name=0);
 
     KMacroCommand *buildCommand(Part *part);
 
diff --git a/kplato/kpttask.cc b/kplato/kpttask.cc
index c8ecba3a0..964b8e4ea 100644
--- a/kplato/kpttask.cc
+++ b/kplato/kpttask.cc
@@ -35,7 +35,7 @@
 namespace KPlato
 {
 
-Task::Task(Node *tqparent) : Node(tqparent), m_resource() {
+Task::Task(Node *parent) : Node(parent), m_resource() {
     //kdDebug()<<k_funcinfo<<"("<<this<<")"<<endl;
     m_resource.setAutoDelete(true);
     Duration d(1, 0, 0);
@@ -52,8 +52,8 @@ Task::Task(Node *tqparent) : Node(tqparent), m_resource() {
     m_childProxyRelations.setAutoDelete(true);
 }
 
-Task::Task(Task &task, Node *tqparent) 
-    : Node(task, tqparent), 
+Task::Task(Task &task, Node *parent) 
+    : Node(task, parent), 
       m_resource() {
     //kdDebug()<<k_funcinfo<<"("<<this<<")"<<endl;
     m_resource.setAutoDelete(true);
@@ -596,15 +596,15 @@ DateTime Task::calculatePredeccessors(const TQPtrList<Relation> &list, int use)
     DateTime time;
     TQPtrListIterator<Relation> it = list;
     for (; it.current(); ++it) {
-        if (it.current()->tqparent()->type() == Type_Summarytask) {
-            //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->tqparent()->name()<<endl;
+        if (it.current()->parent()->type() == Type_Summarytask) {
+            //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->parent()->name()<<endl;
             continue; // skip summarytasks
         }
-        DateTime t = it.current()->tqparent()->calculateForward(use); // early finish
+        DateTime t = it.current()->parent()->calculateForward(use); // early finish
         switch (it.current()->type()) {
             case Relation::StartStart:
                 // I can't start earlier than my predesseccor
-                t = it.current()->tqparent()->getEarliestStart() + it.current()->lag();
+                t = it.current()->parent()->getEarliestStart() + it.current()->lag();
                 break;
             case Relation::FinishFinish:
                 // I can't finish earlier than my predeccessor, so
@@ -723,7 +723,7 @@ DateTime Task::calculateSuccessors(const TQPtrList<Relation> &list, int use) {
     TQPtrListIterator<Relation> it = list;
     for (; it.current(); ++it) {
         if (it.current()->child()->type() == Type_Summarytask) {
-            //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->tqparent()->name()<<endl;
+            //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->parent()->name()<<endl;
             continue; // skip summarytasks
         }
         DateTime t = it.current()->child()->calculateBackward(use);
@@ -848,17 +848,17 @@ DateTime Task::schedulePredeccessors(const TQPtrList<Relation> &list, int use) {
     DateTime time;
     TQPtrListIterator<Relation> it = list;
     for (; it.current(); ++it) {
-        if (it.current()->tqparent()->type() == Type_Summarytask) {
-            //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->tqparent()->name()<<endl;
+        if (it.current()->parent()->type() == Type_Summarytask) {
+            //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->parent()->name()<<endl;
             continue; // skip summarytasks
         }
         // schedule the predecessors
-        DateTime earliest = it.current()->tqparent()->getEarliestStart();
-        DateTime t = it.current()->tqparent()->scheduleForward(earliest, use);
+        DateTime earliest = it.current()->parent()->getEarliestStart();
+        DateTime t = it.current()->parent()->scheduleForward(earliest, use);
         switch (it.current()->type()) {
             case Relation::StartStart:
                 // I can't start before my predesseccor
-                t = it.current()->tqparent()->startTime() + it.current()->lag();
+                t = it.current()->parent()->startTime() + it.current()->lag();
                 break;
             case Relation::FinishFinish:
                 // I can't end before my predecessor, so
@@ -1301,13 +1301,13 @@ void Task::addParentProxyRelations(TQPtrList<Relation> &list) {
             nodes.current()->addParentProxyRelations(dependParentNodes());
         }        
     } else {
-        // add 'this' as child relation to the relations tqparent
+        // add 'this' as child relation to the relations parent
         //kdDebug()<<k_funcinfo<<m_name<<" is not summary task"<<endl;
         TQPtrListIterator<Relation> it = list;
         for (; it.current(); ++it) {
-            it.current()->tqparent()->addChildProxyRelation(this, it.current());
-            // add a tqparent relation to myself
-            addParentProxyRelation(it.current()->tqparent(), it.current());
+            it.current()->parent()->addChildProxyRelation(this, it.current());
+            // add a parent relation to myself
+            addParentProxyRelation(it.current()->parent(), it.current());
         }
     }
 }
@@ -1323,7 +1323,7 @@ void Task::addChildProxyRelations(TQPtrList<Relation> &list) {
             nodes.current()->addChildProxyRelations(dependChildNodes());
         }        
     } else {
-        // add 'this' as tqparent relation to the relations child
+        // add 'this' as parent relation to the relations child
         //kdDebug()<<k_funcinfo<<m_name<<" is not summary task"<<endl;
         TQPtrListIterator<Relation> it = list;
         for (; it.current(); ++it) {
@@ -1337,13 +1337,13 @@ 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 tqparent proxy from my tqchildren "<<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);
             }
         } else {
-            //kdDebug()<<"Add tqparent proxy from "<<node->name()<<" to (me) "<<m_name<<endl;
+            //kdDebug()<<"Add parent proxy from "<<node->name()<<" to (me) "<<m_name<<endl;
             m_parentProxyRelations.append(new ProxyRelation(node, this, rel->type(), rel->lag()));
         }
     }
@@ -1497,13 +1497,13 @@ bool Task::calcCriticalPath(bool fromEnd) {
         }
         TQPtrListIterator<Relation> it(m_parentProxyRelations);
         for (; it.current(); ++it) {
-            if (it.current()->tqparent()->calcCriticalPath(fromEnd)) {
+            if (it.current()->parent()->calcCriticalPath(fromEnd)) {
                 m_currentSchedule->inCriticalPath = true;
             }
         }
         TQPtrListIterator<Relation> pit(m_dependParentNodes);
         for (; pit.current(); ++pit) {
-            if (pit.current()->tqparent()->calcCriticalPath(fromEnd)) {
+            if (pit.current()->parent()->calcCriticalPath(fromEnd)) {
                 m_currentSchedule->inCriticalPath = true;
             }
         }
diff --git a/kplato/kpttask.h b/kplato/kpttask.h
index cace7dcbe..2d3776dbf 100644
--- a/kplato/kpttask.h
+++ b/kplato/kpttask.h
@@ -39,8 +39,8 @@ class DateTime;
   */
 class Task : public Node {
 public:
-    Task(Node *tqparent = 0);
-    Task(Task &task, Node *tqparent = 0);
+    Task(Node *parent = 0);
+    Task(Task &task, Node *parent = 0);
     ~Task();
 
     /// Return task type. Can be Type_Task, Type_Summarytask ot Type_Milestone.
@@ -193,7 +193,7 @@ public:
     
     /// Check if this node has any dependent child nodes.
     bool isEndNode() const;
-    /// Check if this node has any dependent tqparent nodes
+    /// Check if this node has any dependent parent nodes
     bool isStartNode() const;
     
     /**
diff --git a/kplato/kpttaskappointmentsview.cc b/kplato/kpttaskappointmentsview.cc
index 81ad4242b..5e96030e4 100644
--- a/kplato/kpttaskappointmentsview.cc
+++ b/kplato/kpttaskappointmentsview.cc
@@ -32,8 +32,8 @@
 namespace KPlato
 {
 
-TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListView *tqparent, bool highlight)
-    : DoubleListViewBase::MasterListItem(tqparent, r->name(), highlight),
+TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListView *parent, bool highlight)
+    : DoubleListViewBase::MasterListItem(parent, r->name(), highlight),
       resource(r) {
       
       setFormat(0, 'f', 1);
@@ -47,8 +47,8 @@ TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListViewItem *p,
     //kdDebug()<<k_funcinfo<<endl;
 }
 
-TaskAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *tqparent, bool highlight)
-    : DoubleListViewBase::MasterListItem(tqparent, text, highlight),
+TaskAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *parent, bool highlight)
+    : DoubleListViewBase::MasterListItem(parent, text, highlight),
       resource(0) {
       
       setFormat(0, 'f', 1);
@@ -56,8 +56,8 @@ TaskAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *
 }
 
 //-------------------------------------------
-TaskAppointmentsView::TaskAppointmentsView(TQWidget *tqparent)
-    : DoubleListViewBase(tqparent),
+TaskAppointmentsView::TaskAppointmentsView(TQWidget *parent)
+    : DoubleListViewBase(parent),
       m_task(0) {
     
     setNameHeader(i18n("Resource"));
diff --git a/kplato/kpttaskappointmentsview.h b/kplato/kpttaskappointmentsview.h
index d4d8e1018..ce3e0cdca 100644
--- a/kplato/kpttaskappointmentsview.h
+++ b/kplato/kpttaskappointmentsview.h
@@ -53,7 +53,7 @@ class TaskAppointmentsView : public DoubleListViewBase
   TQ_OBJECT
 public:
 
-    TaskAppointmentsView(TQWidget *tqparent);
+    TaskAppointmentsView(TQWidget *parent);
 
     //~TaskAppointmentsView();
 
@@ -76,9 +76,9 @@ protected slots:
 private:
     class ResourceItem : public DoubleListViewBase::MasterListItem {
     public:
-        ResourceItem(Resource *r, TQListView *tqparent, bool highlight=false);
-        ResourceItem(Resource *r, TQListViewItem *tqparent, bool highlight=false);
-        ResourceItem(TQString text, TQListViewItem *tqparent, bool highlight=false);
+        ResourceItem(Resource *r, TQListView *parent, bool highlight=false);
+        ResourceItem(Resource *r, TQListViewItem *parent, bool highlight=false);
+        ResourceItem(TQString text, TQListViewItem *parent, bool highlight=false);
         
         Resource *resource;
         EffortCostMap effortMap;
diff --git a/kplato/kpttaskcostpanel.h b/kplato/kpttaskcostpanel.h
index 55fc121e4..005145bcf 100644
--- a/kplato/kpttaskcostpanel.h
+++ b/kplato/kpttaskcostpanel.h
@@ -37,7 +37,7 @@ class TaskCostPanelImpl : public TaskCostPanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    TaskCostPanelImpl(TQWidget *tqparent=0, const char *name=0);
+    TaskCostPanelImpl(TQWidget *parent=0, const char *name=0);
 
 signals:
     void changed();
@@ -50,7 +50,7 @@ class TaskCostPanel : public TaskCostPanelImpl {
     Q_OBJECT
   TQ_OBJECT
 public:
-    TaskCostPanel(Task &task, Accounts &accounts, TQWidget *tqparent=0, const char *name=0);
+    TaskCostPanel(Task &task, Accounts &accounts, TQWidget *parent=0, const char *name=0);
 
     KCommand *buildCommand(Part *part);
 
diff --git a/kplato/kpttaskdefaultpanel.cc b/kplato/kpttaskdefaultpanel.cc
index dc1168970..3fd5472b1 100644
--- a/kplato/kpttaskdefaultpanel.cc
+++ b/kplato/kpttaskdefaultpanel.cc
@@ -51,8 +51,8 @@
 namespace KPlato
 {
 
-TaskDefaultPanel::TaskDefaultPanel(Task &task, StandardWorktime *workTime, TQWidget *tqparent, const char *n)
-    : ConfigTaskPanelImpl(tqparent, n),
+TaskDefaultPanel::TaskDefaultPanel(Task &task, StandardWorktime *workTime, TQWidget *parent, const char *n)
+    : ConfigTaskPanelImpl(parent, n),
       m_task(task),
       m_dayLength(24)
 {
@@ -332,9 +332,9 @@ Duration ConfigTaskPanelImpl::estimationValue()
 }
 
 
-void ConfigTaskPanelImpl::setEstimateFields( int tqmask )
+void ConfigTaskPanelImpl::setEstimateFields( int mask )
 {
-    estimate->setVisibleFields(tqmask);
+    estimate->setVisibleFields(mask);
 }
 
 
diff --git a/kplato/kpttaskdefaultpanel.h b/kplato/kpttaskdefaultpanel.h
index 8ab532e5c..5d1acb4b4 100644
--- a/kplato/kpttaskdefaultpanel.h
+++ b/kplato/kpttaskdefaultpanel.h
@@ -37,7 +37,7 @@ class ConfigTaskPanelImpl : public ConfigTaskPanelBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    ConfigTaskPanelImpl(TQWidget *tqparent, const char *name);
+    ConfigTaskPanelImpl(TQWidget *parent, const char *name);
     
     virtual int schedulingType() const;
     virtual int estimationType() const;
@@ -62,7 +62,7 @@ public slots:
     virtual void setEstimate( const Duration & duration );
     virtual void setEstimateType( int type );
     virtual void checkAllFieldsFilled();
-    virtual void setEstimateFields( int tqmask );
+    virtual void setEstimateFields( int mask );
     virtual void setEstimateScales( double day );
     virtual void setEstimateFieldUnit( int field, TQString unit );
     virtual void startDateChanged();
@@ -90,7 +90,7 @@ class TaskDefaultPanel : public ConfigTaskPanelImpl {
     Q_OBJECT
   TQ_OBJECT
 public:
-    TaskDefaultPanel(Task &task, StandardWorktime *workTime=0, TQWidget *tqparent=0, const char *name=0);
+    TaskDefaultPanel(Task &task, StandardWorktime *workTime=0, TQWidget *parent=0, const char *name=0);
 
     KMacroCommand *buildCommand(Part *part);
 
diff --git a/kplato/kpttaskdialog.h b/kplato/kpttaskdialog.h
index 169aec6b4..2e6c15866 100644
--- a/kplato/kpttaskdialog.h
+++ b/kplato/kpttaskdialog.h
@@ -64,9 +64,9 @@ public:
      * @param accounts all defined accounts
      * @param workTime defines the number of hours pr day and week
      * @param baseline if true, project is baselined
-     * @param tqparent tqparent widget
+     * @param parent parent widget
      */
-    TaskDialog(Task &task, Accounts &accounts, StandardWorktime *workTime=0, bool baseline=false,  TQWidget *tqparent=0);
+    TaskDialog(Task &task, Accounts &accounts, StandardWorktime *workTime=0, bool baseline=false,  TQWidget *parent=0);
 
     KCommand *buildCommand(Part *part);
 
diff --git a/kplato/kpttaskgeneralpanel.cc b/kplato/kpttaskgeneralpanel.cc
index 7664a89fe..6dd1dad2d 100644
--- a/kplato/kpttaskgeneralpanel.cc
+++ b/kplato/kpttaskgeneralpanel.cc
@@ -372,9 +372,9 @@ Duration TaskGeneralPanelImpl::estimationValue()
 }
 
 
-void TaskGeneralPanelImpl::setEstimateFields( int tqmask )
+void TaskGeneralPanelImpl::setEstimateFields( int mask )
 {
-    estimate->setVisibleFields(tqmask);
+    estimate->setVisibleFields(mask);
 }
 
 
diff --git a/kplato/kpttaskgeneralpanel.h b/kplato/kpttaskgeneralpanel.h
index 29634d274..f92f32582 100644
--- a/kplato/kpttaskgeneralpanel.h
+++ b/kplato/kpttaskgeneralpanel.h
@@ -39,7 +39,7 @@ class TaskGeneralPanelImpl : public TaskGeneralPanelBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    TaskGeneralPanelImpl(TQWidget *tqparent, const char *name);
+    TaskGeneralPanelImpl(TQWidget *parent, const char *name);
     
     virtual int schedulingType() const;
     virtual int estimationType() const;
@@ -64,7 +64,7 @@ public slots:
     virtual void setEstimate( const Duration & duration );
     virtual void setEstimateType( int type );
     virtual void checkAllFieldsFilled();
-    virtual void setEstimateFields( int tqmask );
+    virtual void setEstimateFields( int mask );
     virtual void setEstimateScales( double day );
     virtual void setEstimateFieldUnit( int field, TQString unit );
     virtual void startDateChanged();
@@ -93,7 +93,7 @@ class TaskGeneralPanel : public TaskGeneralPanelImpl {
     Q_OBJECT
   TQ_OBJECT
 public:
-    TaskGeneralPanel(Task &task, StandardWorktime *workTime=0, bool baseline=false, TQWidget *tqparent=0, const char *name=0);
+    TaskGeneralPanel(Task &task, StandardWorktime *workTime=0, bool baseline=false, TQWidget *parent=0, const char *name=0);
 
     KMacroCommand *buildCommand(Part *part);
 
diff --git a/kplato/kpttaskprogressdialog.h b/kplato/kpttaskprogressdialog.h
index 8145062d6..83c2908e0 100644
--- a/kplato/kpttaskprogressdialog.h
+++ b/kplato/kpttaskprogressdialog.h
@@ -36,7 +36,7 @@ class TaskProgressDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    TaskProgressDialog(Task &task, StandardWorktime *workTime, TQWidget *tqparent=0);
+    TaskProgressDialog(Task &task, StandardWorktime *workTime, TQWidget *parent=0);
 
     KCommand *buildCommand(Part *part);
 
diff --git a/kplato/kpttaskprogresspanel.cc b/kplato/kpttaskprogresspanel.cc
index 52cab18e9..e8cfb570f 100644
--- a/kplato/kpttaskprogresspanel.cc
+++ b/kplato/kpttaskprogresspanel.cc
@@ -41,8 +41,8 @@
 namespace KPlato
 {
 
-TaskProgressPanel::TaskProgressPanel(Task &task, StandardWorktime *workTime, TQWidget *tqparent, const char *name)
-    : TaskProgressPanelImpl(tqparent, name),
+TaskProgressPanel::TaskProgressPanel(Task &task, StandardWorktime *workTime, TQWidget *parent, const char *name)
+    : TaskProgressPanelImpl(parent, name),
       m_task(task),
       m_dayLength(24)
 {
@@ -124,8 +124,8 @@ void TaskProgressPanel::setEstimateScales( int day )
 
 //-------------------------------------
 
-TaskProgressPanelImpl::TaskProgressPanelImpl(TQWidget *tqparent, const char *name, WFlags f)
-    : TaskProgressPanelBase(tqparent, name, f) {
+TaskProgressPanelImpl::TaskProgressPanelImpl(TQWidget *parent, const char *name, WFlags f)
+    : TaskProgressPanelBase(parent, name, f) {
     
     connect(started, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotStartedChanged(bool)));
     connect(finished, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFinishedChanged(bool)));
diff --git a/kplato/kpttaskprogresspanel.h b/kplato/kpttaskprogresspanel.h
index fe22441f4..589d37df2 100644
--- a/kplato/kpttaskprogresspanel.h
+++ b/kplato/kpttaskprogresspanel.h
@@ -35,7 +35,7 @@ class TaskProgressPanelImpl : public TaskProgressPanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    TaskProgressPanelImpl(TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+    TaskProgressPanelImpl(TQWidget *parent=0, const char *name=0, WFlags f=0);
     
     void enableWidgets();
 
@@ -53,7 +53,7 @@ class TaskProgressPanel : public TaskProgressPanelImpl {
     Q_OBJECT
   TQ_OBJECT
 public:
-    TaskProgressPanel(Task &task, StandardWorktime *workTime=0, TQWidget *tqparent=0, const char *name=0);
+    TaskProgressPanel(Task &task, StandardWorktime *workTime=0, TQWidget *parent=0, const char *name=0);
 
     KCommand *buildCommand(Part *part);
     
diff --git a/kplato/kptview.cc b/kplato/kptview.cc
index a5b9f6b0c..16501cc4e 100644
--- a/kplato/kptview.cc
+++ b/kplato/kptview.cc
@@ -99,8 +99,8 @@
 namespace KPlato
 {
 
-View::View(Part* part, TQWidget* tqparent, const char* /*name*/)
-    : KoView(part, tqparent, "Main View"),
+View::View(Part* part, TQWidget* parent, const char* /*name*/)
+    : KoView(part, parent, "Main View"),
     m_ganttview(0),
     m_gantttqlayout(0),
     m_pertview(0),
@@ -1375,7 +1375,7 @@ void View::slotPrintTestDebug() {
 //     kdDebug()<<"------------Test 3 Parent calendar-----------------"<<endl;
 //     {
 //     Calendar *t = new Calendar("Test 3");
-//     Calendar *p = new Calendar("Test 3 tqparent");
+//     Calendar *p = new Calendar("Test 3 parent");
 //     t->setParent(p);
 //     TQDate wdate(2006,1,2);
 //     DateTime before = DateTime(wdate.addDays(-1));
@@ -1436,7 +1436,7 @@ void View::slotPrintTestDebug() {
 //     {
 //     TQTime t1(8,0,0);
 //     TQTime t2(10,0,0);
-//     Calendar *p = new Calendar("Test 4 tqparent");
+//     Calendar *p = new Calendar("Test 4 parent");
 //     CalendarDay *wd1 = p->weekday(0); // monday
 //     if (wd1 == 0) {
 //         kdDebug()<<"Failed to get weekday"<<endl;
diff --git a/kplato/kptview.h b/kplato/kptview.h
index 099895e10..38d93501b 100644
--- a/kplato/kptview.h
+++ b/kplato/kptview.h
@@ -60,7 +60,7 @@ class View : public KoView {
   TQ_OBJECT
 
 public:
-    View(Part* part, TQWidget* tqparent=0, const char* name=0);
+    View(Part* part, TQWidget* parent=0, const char* name=0);
     ~View();
     /**
      * Support zooming.
diff --git a/kplato/kptwbsdefinitiondialog.h b/kplato/kptwbsdefinitiondialog.h
index eefb2c7d4..33436f5b1 100644
--- a/kplato/kptwbsdefinitiondialog.h
+++ b/kplato/kptwbsdefinitiondialog.h
@@ -35,7 +35,7 @@ class WBSDefinitionDialog : public KDialogBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    WBSDefinitionDialog(WBSDefinition &def, TQWidget *tqparent=0, const char *name=0);
+    WBSDefinitionDialog(WBSDefinition &def, TQWidget *parent=0, const char *name=0);
 
     KMacroCommand *buildCommand(Part *part);
 
diff --git a/kplato/kptwbsdefinitionpanel.h b/kplato/kptwbsdefinitionpanel.h
index 13c29bcdb..b3fa3c60d 100644
--- a/kplato/kptwbsdefinitionpanel.h
+++ b/kplato/kptwbsdefinitionpanel.h
@@ -34,7 +34,7 @@ class WBSDefinitionPanel : public WBSDefinitionPanelBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    WBSDefinitionPanel(WBSDefinition &def, TQWidget *tqparent=0, const char *name=0);
+    WBSDefinitionPanel(WBSDefinition &def, TQWidget *parent=0, const char *name=0);
 
     KMacroCommand *buildCommand(Part *part);
 
diff --git a/kplato/tests/CalendarTester.cpp b/kplato/tests/CalendarTester.cpp
index 460679ec9..bf0f299f5 100644
--- a/kplato/tests/CalendarTester.cpp
+++ b/kplato/tests/CalendarTester.cpp
@@ -90,7 +90,7 @@ void CalendarTester::testWeekdays() {
 
 void CalendarTester::testCalendarWithParent() {
     KPlato::Calendar t("Test 3");
-    KPlato::Calendar p("Test 3 tqparent");
+    KPlato::Calendar p("Test 3 parent");
     t.setParent(&p);
     TQDate wdate(2006,1,2);
     KPlato::DateTime before = KPlato::DateTime(wdate.addDays(-1));
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp
index 41f940a61..b616f802d 100644
--- a/kpresenter/KPrBackDia.cpp
+++ b/kpresenter/KPrBackDia.cpp
@@ -43,8 +43,8 @@
 
 #include <KoPicture.h>
 
-KPrBackPreview::KPrBackPreview( TQWidget *tqparent, KPrPage *page )
-    : TQFrame( tqparent )
+KPrBackPreview::KPrBackPreview( TQWidget *parent, KPrPage *page )
+    : TQFrame( parent )
 {
     setFrameStyle( WinPanel | Sunken );
     back = new KPrBackGround( page );
@@ -65,13 +65,13 @@ void KPrBackPreview::drawContents( TQPainter *p )
     p->restore();
 }
 
-KPrBackDialog::KPrBackDialog( TQWidget* tqparent, const char* name,
+KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name,
                   BackType backType, const TQColor &backColor1,
                   const TQColor &backColor2, BCType _bcType,
                   const KoPicture &backPic,
                   BackView backPicView, bool _unbalanced,
                   int _xfactor, int _yfactor, KPrPage *_page )
-    : KDialogBase( tqparent, name, true, "",KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel|
+    : KDialogBase( parent, name, true, "",KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel|
                    KDialogBase::User1|KDialogBase::User2 ),
       m_useMasterBackground( 0 ), m_picture(backPic),m_oldpicture(backPic), m_page( _page )
 {
diff --git a/kpresenter/KPrBackDia.h b/kpresenter/KPrBackDia.h
index 36ae92f55..dba9b9bc5 100644
--- a/kpresenter/KPrBackDia.h
+++ b/kpresenter/KPrBackDia.h
@@ -48,7 +48,7 @@ class KPrBackPreview : public TQFrame
   TQ_OBJECT
 
 public:
-    KPrBackPreview( TQWidget *tqparent, KPrPage *page );
+    KPrBackPreview( TQWidget *parent, KPrPage *page );
     virtual ~KPrBackPreview();
 
     KPrBackGround *backGround() const {
@@ -69,7 +69,7 @@ class KPrBackDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    KPrBackDialog( TQWidget* tqparent, const char* name,
+    KPrBackDialog( TQWidget* parent, const char* name,
              BackType backType, const TQColor &backColor1,
              const TQColor &backColor2, BCType _bcType,
              const KoPicture &backPic,
diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp
index 7e4b43711..6e550fe0b 100644
--- a/kpresenter/KPrBrushProperty.cpp
+++ b/kpresenter/KPrBrushProperty.cpp
@@ -33,8 +33,8 @@
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 
-KPrBrushProperty::KPrBrushProperty( TQWidget *tqparent, const char *name, const KPrBrushCmd::Brush &brush )
-    : TQWidget( tqparent, name )
+KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KPrBrushCmd::Brush &brush )
+    : TQWidget( parent, name )
     , m_brush( brush )
 {
     TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
diff --git a/kpresenter/KPrBrushProperty.h b/kpresenter/KPrBrushProperty.h
index 58f415d89..ed9ca2725 100644
--- a/kpresenter/KPrBrushProperty.h
+++ b/kpresenter/KPrBrushProperty.h
@@ -38,7 +38,7 @@ class KPrBrushProperty : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrBrushProperty( TQWidget *tqparent, const char *name, const KPrBrushCmd::Brush &brush );
+    KPrBrushProperty( TQWidget *parent, const char *name, const KPrBrushCmd::Brush &brush );
     ~KPrBrushProperty();
 
     int getBrushPropertyChange() const;
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index 2ada2d93a..c43faed36 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -92,8 +92,8 @@
 const int KPrCanvas::MOUSE_SNAP_DISTANCE = 4;
 const int KPrCanvas::KEY_SNAP_DISTANCE = 2;
 
-KPrCanvas::KPrCanvas( TQWidget *tqparent, const char *name, KPrView *_view )
-: TQWidget( tqparent, name, WStaticContents|WResizeNoErase|WRepaintNoErase )
+KPrCanvas::KPrCanvas( TQWidget *parent, const char *name, KPrView *_view )
+: TQWidget( parent, name, WStaticContents|WResizeNoErase|WRepaintNoErase )
 , buffer( size() )
 , m_gl( _view, _view->zoomHandler() )
 , m_paintGuides( false )
@@ -108,7 +108,7 @@ KPrCanvas::KPrCanvas( TQWidget *tqparent, const char *name, KPrView *_view )
 
     m_keyPressEvent = false;
     m_drawSymetricObject = false;
-    if ( tqparent ) {
+    if ( parent ) {
         showingLastSlide = false;
         mousePressed = false;
         drawContour = false;
diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h
index c7c67c023..e2b373e1b 100644
--- a/kpresenter/KPrCanvas.h
+++ b/kpresenter/KPrCanvas.h
@@ -87,7 +87,7 @@ class KPrCanvas : public TQWidget
 public:
 
     /// constructor
-    KPrCanvas( TQWidget *tqparent=0,const char *name=0,KPrView *_view=0 );
+    KPrCanvas( TQWidget *parent=0,const char *name=0,KPrView *_view=0 );
     /// destructor
     ~KPrCanvas();
 
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index da37a08ed..e93977aa4 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -79,47 +79,47 @@
 #include <kspell2/broker.h>
 using namespace KSpell2;
 
-KPrConfig::KPrConfig( KPrView* tqparent )
+KPrConfig::KPrConfig( KPrView* parent )
     : KDialogBase(KDialogBase::IconList,i18n("Configure KPresenter") ,
                   KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel| KDialogBase::Default,
-                  KDialogBase::Ok, tqparent)
+                  KDialogBase::Ok, parent)
 
 {
-    m_doc = tqparent->kPresenterDoc();
+    m_doc = parent->kPresenterDoc();
     TQVBox *page = addVBoxPage( i18n("Interface"), i18n("Interface"),
                                BarIcon("misc", KIcon::SizeMedium) );
-    _interfacePage=new KPrConfigureInterfacePage( tqparent, page );
+    _interfacePage=new KPrConfigureInterfacePage( parent, page );
     page = addVBoxPage( i18n("Color"), i18n("Color"),
                         BarIcon("colorize", KIcon::SizeMedium) );
-    _colorBackground = new KPrConfigureColorBackground( tqparent, page );
+    _colorBackground = new KPrConfigureColorBackground( parent, page );
 
     page = addVBoxPage( i18n("Spelling"), i18n("Spellchecker Behavior"),
                         BarIcon("spellcheck", KIcon::SizeMedium) );
-    _spellPage=new KPrConfigureSpellPage(tqparent, page);
+    _spellPage=new KPrConfigureSpellPage(parent, page);
 
     page = addVBoxPage( i18n("Misc"), i18n("Misc"),
                         BarIcon("misc", KIcon::SizeMedium) );
-    _miscPage=new KPrConfigureMiscPage(tqparent, page);
+    _miscPage=new KPrConfigureMiscPage(parent, page);
 
     page = addVBoxPage( i18n("Document"), i18n("Document Settings"),
                         BarIcon("kpresenter_kpr", KIcon::SizeMedium) );
 
-    _defaultDocPage=new KPrConfigureDefaultDocPage(tqparent, page);
+    _defaultDocPage=new KPrConfigureDefaultDocPage(parent, page);
 
     page = addVBoxPage( i18n("Tools"), i18n("Default Tools Settings"),
                         BarIcon("configure", KIcon::SizeMedium) );
 
-    _toolsPage=new KPrConfigureToolsPage(tqparent, page);
+    _toolsPage=new KPrConfigureToolsPage(parent, page);
 
     page = addVBoxPage( i18n("Paths"), i18n("Path Settings"),
                         BarIcon("path") );
 
-    m_pathPage=new KPrConfigurePathPage(tqparent, page);
+    m_pathPage=new KPrConfigurePathPage(parent, page);
 
     if (KoSpeaker::isKttsdInstalled()) {
         page = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), i18n("Text-to-Speech Settings"),
                             BarIcon("access", KIcon::SizeMedium) );
-        m_ttsPage=new KPrConfigureTTSPage(tqparent, page);
+        m_ttsPage=new KPrConfigureTTSPage(parent, page);
     } else m_ttsPage = 0;
 
     connect( this, TQT_SIGNAL( okClicked() ),this, TQT_SLOT( slotApply() ) );
@@ -203,8 +203,8 @@ void KPrConfig::slotDefault()
     }
 }
 
-KPrConfigureInterfacePage::KPrConfigureInterfacePage( KPrView *_view, TQWidget *tqparent , char *name )
-    :TQWidget ( tqparent,name )
+KPrConfigureInterfacePage::KPrConfigureInterfacePage( KPrView *_view, TQWidget *parent , char *name )
+    :TQWidget ( parent,name )
 {
     TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 );
 
@@ -312,8 +312,8 @@ void KPrConfigureInterfacePage::slotDefault()
     showStatusBar->setChecked(true);
 }
 
-KPrConfigureColorBackground::KPrConfigureColorBackground( KPrView* _view, TQWidget *tqparent , char *name )
-    :TQWidget ( tqparent,name )
+KPrConfigureColorBackground::KPrConfigureColorBackground( KPrView* _view, TQWidget *parent , char *name )
+    :TQWidget ( parent,name )
 {
     m_pView = _view;
     config = KPrFactory::global()->config();
@@ -382,12 +382,12 @@ void KPrConfigureColorBackground::slotDefault()
 
 
 
-KPrConfigureSpellPage::KPrConfigureSpellPage( KPrView *_view, TQWidget *tqparent, char *name )
-    : TQWidget( tqparent, name )
+KPrConfigureSpellPage::KPrConfigureSpellPage( KPrView *_view, TQWidget *parent, char *name )
+    : TQWidget( parent, name )
 {
     m_pView=_view;
     config = KPrFactory::global()->config();
-    m_spellConfigWidget = new ConfigWidget( _view->broker(), tqparent );
+    m_spellConfigWidget = new ConfigWidget( _view->broker(), parent );
     m_spellConfigWidget->setBackgroundCheckingButtonShown( true );
 }
 
@@ -410,8 +410,8 @@ void KPrConfigureSpellPage::slotDefault()
     m_spellConfigWidget->slotDefault();
 }
 
-KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *tqparent, char *name )
-    : TQWidget( tqparent, name )
+KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, char *name )
+    : TQWidget( parent, name )
 {
     TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 );
 
@@ -588,8 +588,8 @@ void KPrConfigureMiscPage::slotDefault()
     resolutionX->setValue( MM_TO_POINT( 5.0 ));
 }
 
-KPrConfigureDefaultDocPage::KPrConfigureDefaultDocPage(KPrView *_view, TQWidget *tqparent, char *name )
-    : TQWidget( tqparent, name )
+KPrConfigureDefaultDocPage::KPrConfigureDefaultDocPage(KPrView *_view, TQWidget *parent, char *name )
+    : TQWidget( parent, name )
 {
     TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 );
 
@@ -811,8 +811,8 @@ void KPrConfigureDefaultDocPage::selectNewDefaultFont() {
     }
 }
 
-KPrConfigureToolsPage::KPrConfigureToolsPage( KPrView *_view, TQWidget *tqparent, char *name )
-    : TQWidget( tqparent, name )
+KPrConfigureToolsPage::KPrConfigureToolsPage( KPrView *_view, TQWidget *parent, char *name )
+    : TQWidget( parent, name )
 {
     TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 );
 
@@ -930,8 +930,8 @@ void KPrConfigureToolsPage::slotDefault()
     pieValues.pieLength = 270 * 16;
 }
 
-KPrConfigurePathPage::KPrConfigurePathPage( KPrView *_view, TQWidget *tqparent, char *name )
-    : TQWidget( tqparent, name )
+KPrConfigurePathPage::KPrConfigurePathPage( KPrView *_view, TQWidget *parent, char *name )
+    : TQWidget( parent, name )
 {
     TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 );
 
@@ -1036,8 +1036,8 @@ void KPrConfigurePathPage::apply()
 
 ////
 
-KPrConfigureTTSPage::KPrConfigureTTSPage( KPrView *_view, TQWidget *tqparent, char *name )
-    : TQWidget( tqparent, name )
+KPrConfigureTTSPage::KPrConfigureTTSPage( KPrView *_view, TQWidget *parent, char *name )
+    : TQWidget( parent, name )
 {
     Q_UNUSED(_view);
 
diff --git a/kpresenter/KPrConfig.h b/kpresenter/KPrConfig.h
index 604b283c4..50ad34f2f 100644
--- a/kpresenter/KPrConfig.h
+++ b/kpresenter/KPrConfig.h
@@ -51,7 +51,7 @@ class KPrConfigureInterfacePage : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrConfigureInterfacePage( KPrView *_view, TQWidget *tqparent = 0, char *name = 0 );
+    KPrConfigureInterfacePage( KPrView *_view, TQWidget *parent = 0, char *name = 0 );
     void apply();
     void slotDefault();
 private:
@@ -68,7 +68,7 @@ class KPrConfigureColorBackground : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrConfigureColorBackground( KPrView* _view, TQWidget *tqparent = 0, char *name = 0 );
+    KPrConfigureColorBackground( KPrView* _view, TQWidget *parent = 0, char *name = 0 );
     void apply();
     void slotDefault();
 protected:
@@ -85,7 +85,7 @@ class KPrConfigureSpellPage : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrConfigureSpellPage( KPrView *_view, TQWidget *tqparent, char *name = 0 );
+    KPrConfigureSpellPage( KPrView *_view, TQWidget *parent, char *name = 0 );
     void apply();
     void slotDefault();
 private:
@@ -99,7 +99,7 @@ class KPrConfigureMiscPage : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrConfigureMiscPage( KPrView  *_view, TQWidget *tqparent, char *name = 0 );
+    KPrConfigureMiscPage( KPrView  *_view, TQWidget *parent, char *name = 0 );
     KCommand *apply();
     void slotDefault();
 private:
@@ -118,7 +118,7 @@ class KPrConfigureDefaultDocPage : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrConfigureDefaultDocPage( KPrView  *_view, TQWidget *tqparent, char *name = 0 );
+    KPrConfigureDefaultDocPage( KPrView  *_view, TQWidget *parent, char *name = 0 );
     ~KPrConfigureDefaultDocPage();
     KCommand *apply();
     void slotDefault();
@@ -150,7 +150,7 @@ class KPrConfigureToolsPage : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrConfigureToolsPage( KPrView  *_view, TQWidget *tqparent, char *name = 0 );
+    KPrConfigureToolsPage( KPrView  *_view, TQWidget *parent, char *name = 0 );
     ~KPrConfigureToolsPage();
     void apply();
     void slotDefault();
@@ -172,7 +172,7 @@ class KPrConfigurePathPage : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrConfigurePathPage( KPrView *_view, TQWidget *tqparent, char *name = 0 );
+    KPrConfigurePathPage( KPrView *_view, TQWidget *parent, char *name = 0 );
     void slotDefault();
     void apply();
 private slots:
@@ -190,7 +190,7 @@ class KPrConfigureTTSPage : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  KPrConfigureTTSPage( KPrView *_view, TQWidget *tqparent, char *name = 0 );
+  KPrConfigureTTSPage( KPrView *_view, TQWidget *parent, char *name = 0 );
   void slotDefault();
   void apply();
 private slots:
@@ -216,7 +216,7 @@ class KPrConfig : public KDialogBase
   TQ_OBJECT
 public:
     enum { KP_INTERFACE = 1, KP_COLOR=2, KP_KSPELL=4,KP_MISC=8, KP_DOC=16, KP_TOOLS=32,KP_PATH = 64 };
-    KPrConfig( KPrView* tqparent );
+    KPrConfig( KPrView* parent );
 public slots:
     void slotApply();
     void slotDefault();
diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp
index 2cc74ef89..7c0fa1c9c 100644
--- a/kpresenter/KPrCustomSlideShowDia.cpp
+++ b/kpresenter/KPrCustomSlideShowDia.cpp
@@ -253,9 +253,9 @@ KPrCustomSlideShowItem::KPrCustomSlideShowItem( TQListBox * listbox, KPrPage * p
 {
 }
 
-KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* tqparent, TQStringList &_listNameSlideShow, 
+KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* parent, TQStringList &_listNameSlideShow, 
                                                     const TQPtrList<KPrPage> &pages, const char *name )
-: KDialogBase( tqparent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel )
+: KDialogBase( parent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel )
 , listNameCustomSlideShow( _listNameSlideShow )
 {
     init();
@@ -265,9 +265,9 @@ KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* tqparent, TQString
     }
 }
 
-KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* tqparent, const TQString &_customName, TQStringList &_listNameSlideShow, 
+KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* parent, const TQString &_customName, TQStringList &_listNameSlideShow, 
                                                     const TQPtrList<KPrPage> &pages, TQValueList<KPrPage *> &customPages, const char* name )
-: KDialogBase( tqparent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel )
+: KDialogBase( parent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel )
 , listNameCustomSlideShow( _listNameSlideShow )
 {
     init();
diff --git a/kpresenter/KPrCustomSlideShowDia.h b/kpresenter/KPrCustomSlideShowDia.h
index 94e6bf2ac..ba0a08344 100644
--- a/kpresenter/KPrCustomSlideShowDia.h
+++ b/kpresenter/KPrCustomSlideShowDia.h
@@ -87,8 +87,8 @@ class KPrDefineCustomSlideShow : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrDefineCustomSlideShow( TQWidget* tqparent, TQStringList &_listNameSlideShow, const TQPtrList<KPrPage> &pages, const char *name = 0L);
-    KPrDefineCustomSlideShow( TQWidget* tqparent, const TQString &_customName, TQStringList &_listNameSlideShow, 
+    KPrDefineCustomSlideShow( TQWidget* parent, TQStringList &_listNameSlideShow, const TQPtrList<KPrPage> &pages, const char *name = 0L);
+    KPrDefineCustomSlideShow( TQWidget* parent, const TQString &_customName, TQStringList &_listNameSlideShow, 
                               const TQPtrList<KPrPage> &pages, TQValueList<KPrPage *> &customPages, const char* name = 0L );
 
     TQString customSlideShowName() const;
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 1a8847526..7a880406b 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -136,9 +136,9 @@ KoDocument *KPrChild::hitTest( const TQPoint &, const TQWMatrix & )
     return 0;
 }
 
-KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name,
+KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name,
                               bool singleViewMode )
-    : KoDocument( parentWidget,widgetName, tqparent, name, singleViewMode ),
+    : KoDocument( parentWidget,widgetName, parent, name, singleViewMode ),
       _gradientCollection(), m_customListTest( 0L ),
       m_childCountBeforeInsert( 0 )
 {
@@ -3837,12 +3837,12 @@ void KPrDocument::makeUsedSoundFileList()
     }
 }
 
-KoView* KPrDocument::createViewInstance( TQWidget* tqparent, const char* name )
+KoView* KPrDocument::createViewInstance( TQWidget* parent, const char* name )
 {
     //the page numbers have to be recalced for the sticky objects
     //as it could not be done during the constructor of KPrView
     recalcPageNum();
-    return new KPrView( this, tqparent, name );
+    return new KPrView( this, parent, name );
 }
 
 void KPrDocument::paintContent( TQPainter& painter, const TQRect& rect,
diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h
index f5921b657..c51060a48 100644
--- a/kpresenter/KPrDocument.h
+++ b/kpresenter/KPrDocument.h
@@ -90,8 +90,8 @@ public:
     KPrChild( KPrDocument *_kpr );
     ~KPrChild();
 
-    // get tqparent
-    KPrDocument* tqparent()const { return m_parent; }
+    // get parent
+    KPrDocument* parent()const { return m_parent; }
 
     virtual KoDocument *hitTest( const TQPoint &, const TQWMatrix & );
 
@@ -548,7 +548,7 @@ protected slots:
     virtual void openTemplate( const TQString& file );
 
 protected:
-    KoView* createViewInstance( TQWidget* tqparent, const char* name );
+    KoView* createViewInstance( TQWidget* parent, const char* name );
     void testAndCloseAllTextObjectProtectedContent();
     // ************ functions ************
     /**
diff --git a/kpresenter/KPrDuplicateObjDia.cpp b/kpresenter/KPrDuplicateObjDia.cpp
index 3396e438d..0b0c7646f 100644
--- a/kpresenter/KPrDuplicateObjDia.cpp
+++ b/kpresenter/KPrDuplicateObjDia.cpp
@@ -34,8 +34,8 @@
 #include <kseparator.h>
 #include <KoUnitWidgets.h>
 
-KPrDuplicatObjDia::KPrDuplicatObjDia( TQWidget *tqparent, KPrDocument * _doc, const char *name)
-    : KDialogBase( tqparent, name, true, "", Ok | Cancel, Ok, true )
+KPrDuplicatObjDia::KPrDuplicatObjDia( TQWidget *parent, KPrDocument * _doc, const char *name)
+    : KDialogBase( parent, name, true, "", Ok | Cancel, Ok, true )
 {
     m_doc=_doc;
     KoUnit::Unit unit = m_doc->unit();
diff --git a/kpresenter/KPrDuplicateObjDia.h b/kpresenter/KPrDuplicateObjDia.h
index 1c49cb5e9..91fe5e5df 100644
--- a/kpresenter/KPrDuplicateObjDia.h
+++ b/kpresenter/KPrDuplicateObjDia.h
@@ -34,7 +34,7 @@ class KPrDuplicatObjDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrDuplicatObjDia( TQWidget *tqparent, KPrDocument * _doc, const char *name=0L);
+    KPrDuplicatObjDia( TQWidget *parent, KPrDocument * _doc, const char *name=0L);
     int nbCopy() const;
     double angle() const;
     double increaseX() const;
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index cfc39358a..a394e0a81 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -48,9 +48,9 @@
 #include <kstandarddirs.h>
 #include <kfiledialog.h>
 
-KPrEffectDia::KPrEffectDia( TQWidget* tqparent, const char* name, const TQPtrList<KPrObject>& _objs,
+KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<KPrObject>& _objs,
                       KPrView *_view )
-    : KDialogBase( tqparent, name, true ), objs( _objs )
+    : KDialogBase( parent, name, true ), objs( _objs )
 {
     view = _view;
     KPrObject *obj = objs.at( 0 );
diff --git a/kpresenter/KPrEffectDia.h b/kpresenter/KPrEffectDia.h
index af0f4d006..a1bf29ee8 100644
--- a/kpresenter/KPrEffectDia.h
+++ b/kpresenter/KPrEffectDia.h
@@ -45,7 +45,7 @@ class KPrEffectDia : public KDialogBase
   TQ_OBJECT
 
 public:
-    KPrEffectDia( TQWidget* tqparent, const char*, const TQPtrList<KPrObject> &_objs,
+    KPrEffectDia( TQWidget* parent, const char*, const TQPtrList<KPrObject> &_objs,
                KPrView* );
 
     ~KPrEffectDia();
diff --git a/kpresenter/KPrFactory.cpp b/kpresenter/KPrFactory.cpp
index 076c1ce87..f9419cbe8 100644
--- a/kpresenter/KPrFactory.cpp
+++ b/kpresenter/KPrFactory.cpp
@@ -29,8 +29,8 @@
 KInstance* KPrFactory::s_global = 0;
 KAboutData* KPrFactory::s_aboutData = 0;
 
-KPrFactory::KPrFactory( TQObject* tqparent, const char* name )
-    : KoFactory( tqparent, name )
+KPrFactory::KPrFactory( TQObject* parent, const char* name )
+    : KoFactory( parent, name )
 {
     (void)global();
 }
@@ -43,12 +43,12 @@ KPrFactory::~KPrFactory()
     s_global=0;
 }
 
-KParts::Part* KPrFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent,
+KParts::Part* KPrFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent,
                                                    const char* name, const char* classname, const TQStringList & )
 {
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    KPrDocument *doc = new KPrDocument( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    KPrDocument *doc = new KPrDocument( parentWidget, widgetName, parent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
         doc->setReadWrite( false );
diff --git a/kpresenter/KPrFactory.h b/kpresenter/KPrFactory.h
index be83fc84f..ca0d112ba 100644
--- a/kpresenter/KPrFactory.h
+++ b/kpresenter/KPrFactory.h
@@ -29,10 +29,10 @@ class KPrFactory : public KoFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrFactory( TQObject* tqparent = 0, const char* name = 0 );
+    KPrFactory( TQObject* parent = 0, const char* name = 0 );
     ~KPrFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0,
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0,
                                             const char *name = 0, const char *classname = "KoDocument",
                                             const TQStringList &args = TQStringList() );
 
diff --git a/kpresenter/KPrFindReplace.cpp b/kpresenter/KPrFindReplace.cpp
index 59a5fcfea..3836a8adb 100644
--- a/kpresenter/KPrFindReplace.cpp
+++ b/kpresenter/KPrFindReplace.cpp
@@ -29,16 +29,16 @@
 #include <KoSearchDia.h>
 #include "KPrTextDocument.h"
 
-KPrFindReplace::KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoSearchDia * dialog,
+KPrFindReplace::KPrFindReplace( TQWidget* parent, KPrCanvas * canvas, KoSearchDia * dialog,
                                 const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView)
-    : KoFindReplace( tqparent, dialog, lstObjects, textView )
+    : KoFindReplace( parent, dialog, lstObjects, textView )
 {
     m_canvas = canvas;
 }
 
-KPrFindReplace::KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoReplaceDia * dialog,
+KPrFindReplace::KPrFindReplace( TQWidget* parent, KPrCanvas * canvas, KoReplaceDia * dialog,
                                 const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView )
-    : KoFindReplace( tqparent, dialog, lstObjects, textView )
+    : KoFindReplace( parent, dialog, lstObjects, textView )
 {
     m_canvas = canvas;
 }
diff --git a/kpresenter/KPrFindReplace.h b/kpresenter/KPrFindReplace.h
index 54ee6861a..e14955239 100644
--- a/kpresenter/KPrFindReplace.h
+++ b/kpresenter/KPrFindReplace.h
@@ -45,12 +45,12 @@ class KPrFindReplace : public KoFindReplace
   TQ_OBJECT
 public:
     /**
-     * The tqparent widget can't be the canvas, otherwise the 'find next' dialog
+     * The parent widget can't be the canvas, otherwise the 'find next' dialog
      * scrolls up/down when using the scrollbars (hehe, cool effect).
      */
-    KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoSearchDia * dialog,
+    KPrFindReplace( TQWidget* parent, KPrCanvas * canvas, KoSearchDia * dialog,
                     const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView );
-    KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoReplaceDia * dialog,
+    KPrFindReplace( TQWidget* parent, KPrCanvas * canvas, KoReplaceDia * dialog,
                     const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView );
     ~KPrFindReplace();
 
diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp
index 16378ef46..89cf00ab1 100644
--- a/kpresenter/KPrGeneralProperty.cpp
+++ b/kpresenter/KPrGeneralProperty.cpp
@@ -31,8 +31,8 @@
 
 #include <KoGeneralPropertyUi.h>
 
-KPrGeneralProperty::KPrGeneralProperty( TQWidget *tqparent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit )
-: TQWidget( tqparent, name )
+KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit )
+: TQWidget( parent, name )
 , m_ratio( 1.0 )
 , m_generalValue( generalValue )
 , m_unit( unit )
diff --git a/kpresenter/KPrGeneralProperty.h b/kpresenter/KPrGeneralProperty.h
index 734978515..d472d2746 100644
--- a/kpresenter/KPrGeneralProperty.h
+++ b/kpresenter/KPrGeneralProperty.h
@@ -54,7 +54,7 @@ public:
         Height = 64
     };
 
-    KPrGeneralProperty( TQWidget *tqparent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit );
+    KPrGeneralProperty( TQWidget *parent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit );
     ~KPrGeneralProperty();
 
     int getGeneralPropertyChange() const;
diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp
index fb9ef42a0..d5d0ed246 100644
--- a/kpresenter/KPrGotoPage.cpp
+++ b/kpresenter/KPrGotoPage.cpp
@@ -33,8 +33,8 @@
 
 KPrGotoPage::KPrGotoPage( const KPrDocument *doc,
                         const TQValueList<int> &slides, int start,
-                        TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name, true, i18n("Goto Slide..."), Ok|Cancel),
+                        TQWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n("Goto Slide..."), Ok|Cancel),
       oldPage(start)
 {
 
@@ -65,15 +65,15 @@ KPrGotoPage::KPrGotoPage( const KPrDocument *doc,
             spinbox->setCurrentItem( spinbox->count()-1 );
     }
 
-    if ( tqparent )
-        tqparent->setCursor( TQt::forbiddenCursor );
+    if ( parent )
+        parent->setCursor( TQt::forbiddenCursor );
 }
 
 int KPrGotoPage::gotoPage( const KPrDocument *doc,
                           const TQValueList<int> &slides, int start,
-                          TQWidget *tqparent)
+                          TQWidget *parent)
 {
-    KPrGotoPage dia( doc, slides, start,tqparent, 0L );
+    KPrGotoPage dia( doc, slides, start,parent, 0L );
     dia.exec();
     dia.resetCursor();
     return dia.page();
diff --git a/kpresenter/KPrGotoPage.h b/kpresenter/KPrGotoPage.h
index 22baf3cbf..50b89c4f5 100644
--- a/kpresenter/KPrGotoPage.h
+++ b/kpresenter/KPrGotoPage.h
@@ -35,11 +35,11 @@ class KPrGotoPage : public KDialogBase
 public:
     KPrGotoPage( const KPrDocument *doc,
                 const TQValueList<int> &slides, int start,
-                TQWidget *tqparent = 0L, const char *name = 0L );
+                TQWidget *parent = 0L, const char *name = 0L );
 
     static int gotoPage( const KPrDocument *doc,
                          const TQValueList<int> &slides, int start,
-                         TQWidget *tqparent = 0L );
+                         TQWidget *parent = 0L );
 
     int page() const;
 
diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp
index a03548501..6a0162c1d 100644
--- a/kpresenter/KPrImageEffectDia.cpp
+++ b/kpresenter/KPrImageEffectDia.cpp
@@ -32,8 +32,8 @@
 
 #include "KPrImageEffectDia.h"
 
-KPrImageEffectDia::KPrImageEffectDia(TQWidget * tqparent, const char * name):
-    KDialogBase(tqparent, name, true, i18n("Image Effect"), Ok|Cancel, Ok)
+KPrImageEffectDia::KPrImageEffectDia(TQWidget * parent, const char * name):
+    KDialogBase(parent, name, true, i18n("Image Effect"), Ok|Cancel, Ok)
 {
     m_pix = TQPixmap();
 
diff --git a/kpresenter/KPrImageEffectDia.h b/kpresenter/KPrImageEffectDia.h
index 38b03937f..0a8fc84b2 100644
--- a/kpresenter/KPrImageEffectDia.h
+++ b/kpresenter/KPrImageEffectDia.h
@@ -33,7 +33,7 @@ class KPrImageEffectDia: public KDialogBase {
   TQ_OBJECT
 
 public:
-    KPrImageEffectDia(TQWidget * tqparent = 0, const char * name = 0);
+    KPrImageEffectDia(TQWidget * parent = 0, const char * name = 0);
     ~KPrImageEffectDia();
 
     /**
diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp
index f649ebc1b..c2db00b42 100644
--- a/kpresenter/KPrImportStyleDia.cpp
+++ b/kpresenter/KPrImportStyleDia.cpp
@@ -35,8 +35,8 @@
 #include "KPrTextObject.h"
 
 KPrImportStyleDia::KPrImportStyleDia( KPrDocument *_doc, KoStyleCollection* currentCollection,
-                                      TQWidget *tqparent, const char *name )
-    :KoImportStyleDia( currentCollection, tqparent, name ),
+                                      TQWidget *parent, const char *name )
+    :KoImportStyleDia( currentCollection, parent, name ),
      m_doc(_doc)
 {
 }
diff --git a/kpresenter/KPrImportStyleDia.h b/kpresenter/KPrImportStyleDia.h
index 8b550d9f8..afae45334 100644
--- a/kpresenter/KPrImportStyleDia.h
+++ b/kpresenter/KPrImportStyleDia.h
@@ -35,7 +35,7 @@ class KPrImportStyleDia : public KoImportStyleDia
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrImportStyleDia( KPrDocument *_doc, KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name = 0 );
+    KPrImportStyleDia( KPrDocument *_doc, KoStyleCollection* currentCollection, TQWidget *parent, const char *name = 0 );
     ~KPrImportStyleDia();
 
 protected:
diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp
index 2e942de7d..48074143d 100644
--- a/kpresenter/KPrMarginWidget.cpp
+++ b/kpresenter/KPrMarginWidget.cpp
@@ -32,8 +32,8 @@
 #include "marginui.h"
 #include <KoUnitWidgets.h>//for KoUnitDoubleSpinBox
 
-KPrMarginWidget::KPrMarginWidget( TQWidget *tqparent, const char *name, const KoUnit::Unit unit )
-: TQWidget( tqparent, name )
+KPrMarginWidget::KPrMarginWidget( TQWidget *parent, const char *name, const KoUnit::Unit unit )
+: TQWidget( parent, name )
 , m_unit( unit )
 , m_changed( false )
 , m_noSignal( false )
diff --git a/kpresenter/KPrMarginWidget.h b/kpresenter/KPrMarginWidget.h
index fc8930ee3..6345df3ed 100644
--- a/kpresenter/KPrMarginWidget.h
+++ b/kpresenter/KPrMarginWidget.h
@@ -33,7 +33,7 @@ class KPrMarginWidget : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrMarginWidget( TQWidget *tqparent, const char *name, const KoUnit::Unit unit );
+    KPrMarginWidget( TQWidget *parent, const char *name, const KoUnit::Unit unit );
     ~KPrMarginWidget();
 
     bool changed() const { return m_changed; }
diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp
index 2abc986fb..ea050f415 100644
--- a/kpresenter/KPrMoveHelpLineDia.cpp
+++ b/kpresenter/KPrMoveHelpLineDia.cpp
@@ -34,9 +34,9 @@
 #include "KPrDocument.h"
 
 
-KPrMoveHelpLineDia::KPrMoveHelpLineDia( TQWidget *tqparent, double value, double limitTop, double limitBottom,
+KPrMoveHelpLineDia::KPrMoveHelpLineDia( TQWidget *parent, double value, double limitTop, double limitBottom,
                                         KPrDocument *_doc, const char *name)
-    : KDialogBase( tqparent, name , true, "", Ok | Cancel | User1, Ok, true )
+    : KDialogBase( parent, name , true, "", Ok | Cancel | User1, Ok, true )
 {
     m_doc=_doc;
     m_bRemoveLine = false;
@@ -64,9 +64,9 @@ double KPrMoveHelpLineDia::newPosition() const
 }
 
 
-KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *tqparent, const KoRect & _pageRect,
+KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pageRect,
                                             KPrDocument *_doc, const char *name)
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
+    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
 {
     limitOfPage=_pageRect;
     m_doc=_doc;
@@ -113,9 +113,9 @@ void KPrInsertHelpLineDia::slotRadioButtonClicked()
     }
 }
 
-KPrInsertHelpPointDia::KPrInsertHelpPointDia( TQWidget *tqparent, const KoRect & _pageRect,
+KPrInsertHelpPointDia::KPrInsertHelpPointDia( TQWidget *parent, const KoRect & _pageRect,
                                               KPrDocument *_doc, double posX, double posY, const char *name)
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel| User1, Ok, true ),
+    : KDialogBase( parent, name , true, "", Ok|Cancel| User1, Ok, true ),
       m_bRemovePoint( false )
 {
     limitOfPage=_pageRect;
diff --git a/kpresenter/KPrMoveHelpLineDia.h b/kpresenter/KPrMoveHelpLineDia.h
index 7bed8b882..92e150589 100644
--- a/kpresenter/KPrMoveHelpLineDia.h
+++ b/kpresenter/KPrMoveHelpLineDia.h
@@ -35,7 +35,7 @@ class KPrMoveHelpLineDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrMoveHelpLineDia( TQWidget *tqparent, double value, double limitTop, double limitBottom,
+    KPrMoveHelpLineDia( TQWidget *parent, double value, double limitTop, double limitBottom,
                         KPrDocument *_doc, const char *name=0L);
 
     double newPosition() const;
@@ -55,7 +55,7 @@ class KPrInsertHelpLineDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrInsertHelpLineDia( TQWidget *tqparent, const KoRect &r, KPrDocument *_doc, const char *name=0L);
+    KPrInsertHelpLineDia( TQWidget *parent, const KoRect &r, KPrDocument *_doc, const char *name=0L);
 
     double newPosition() const;
     //return true if we add a new horizontal line help
@@ -78,7 +78,7 @@ class KPrInsertHelpPointDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrInsertHelpPointDia( TQWidget *tqparent, const KoRect &r, KPrDocument *_doc, double poxX=0.0,
+    KPrInsertHelpPointDia( TQWidget *parent, const KoRect &r, KPrDocument *_doc, double poxX=0.0,
                            double posY=0.0, const char *name=0L);
 
     KoPoint newPosition() const;
diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp
index bbc14a57a..1afef9776 100644
--- a/kpresenter/KPrPBPreview.cpp
+++ b/kpresenter/KPrPBPreview.cpp
@@ -25,8 +25,8 @@
 #include <KoTextZoomHandler.h>
 #include "KPrUtils.h"
 
-KPrPBPreview::KPrPBPreview( TQWidget* tqparent, const char* name, PaintType _paintType )
-    : TQFrame( tqparent, name )
+KPrPBPreview::KPrPBPreview( TQWidget* parent, const char* name, PaintType _paintType )
+    : TQFrame( parent, name )
 {
     //FIXME zoom
     _zoomHandler=new KoTextZoomHandler();
diff --git a/kpresenter/KPrPBPreview.h b/kpresenter/KPrPBPreview.h
index 092adb4e8..c3ba061ec 100644
--- a/kpresenter/KPrPBPreview.h
+++ b/kpresenter/KPrPBPreview.h
@@ -47,7 +47,7 @@ public:
         Gradient
     };
 
-    KPrPBPreview( TQWidget* tqparent, const char* name, PaintType _paintType = Pen );
+    KPrPBPreview( TQWidget* parent, const char* name, PaintType _paintType = Pen );
     ~KPrPBPreview();
     void setPen( const KoPen &_pen ) { pen = _pen; tqrepaint( true ); }
     void setBrush( const TQBrush &_brush ) { brush = _brush; tqrepaint( true ); }
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index df4ca0fc2..d8e65bac1 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -1449,7 +1449,7 @@ KPrPartObject* KPrPage::insertObject( const KoRect& _rect, KoDocumentEntry& _e )
     if ( !doc )
         return NULL;
 
-    if ( !doc->showEmbedInitDialog( 0 ) ) //TODO should really have tqparent
+    if ( !doc->showEmbedInitDialog( 0 ) ) //TODO should really have parent
         return NULL;
 
     TQRect r = TQRect( (int)_rect.left(), (int)_rect.top(),
@@ -1550,11 +1550,11 @@ void KPrPage::recalcPageNum()
     }
 }
 
-void KPrPage::changePicture( const KURL & url, TQWidget *tqparent )
+void KPrPage::changePicture( const KURL & url, TQWidget *parent )
 {
     // filename has been chosen in KPrView with a filedialog,
     // so we know it exists
-    KoPicture image = m_doc->pictureCollection()->downloadPicture( url, tqparent );
+    KoPicture image = m_doc->pictureCollection()->downloadPicture( url, parent );
 
     TQPtrListIterator<KPrObject> it( m_objectList );
     for ( ; it.current() ; ++it )
diff --git a/kpresenter/KPrPage.h b/kpresenter/KPrPage.h
index 431a3662d..142068ed0 100644
--- a/kpresenter/KPrPage.h
+++ b/kpresenter/KPrPage.h
@@ -417,7 +417,7 @@ public:
 
     void slotRepaintVariable();
     void recalcPageNum();
-    void changePicture( const KURL & url, TQWidget *tqparent );
+    void changePicture( const KURL & url, TQWidget *parent );
     void insertPicture( const TQString &filename, const KoPoint &pos );
     void insertPicture( const TQString &_file, const KoRect &_rect );
 
diff --git a/kpresenter/KPrPageIface.cpp b/kpresenter/KPrPageIface.cpp
index c1ecdac99..36798a0a1 100644
--- a/kpresenter/KPrPageIface.cpp
+++ b/kpresenter/KPrPageIface.cpp
@@ -484,7 +484,7 @@ void KPrPageIface::slideSelected(bool _b)
 
 void KPrPageIface::changePicture( const TQString & filename )
 {
-    // TODO: find a better tqparent
+    // TODO: find a better parent
     m_page->changePicture(filename, 0);
 }
 
diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp
index e2c24e1a6..9f903608c 100644
--- a/kpresenter/KPrPartObject.cpp
+++ b/kpresenter/KPrPartObject.cpp
@@ -47,7 +47,7 @@ KPrPartObject &KPrPartObject::operator=( const KPrPartObject & )
 
 void KPrPartObject::updateChildGeometry()
 {
-    KoTextZoomHandler* zh = child->tqparent()->zoomHandler();
+    KoTextZoomHandler* zh = child->parent()->zoomHandler();
     child->setGeometry( zh->zoomRect( getRect() ), true );
     child->setRotationPoint( TQPoint( zh->zoomItX( getOrig().x() + getSize().width() / 2 ),
                                      zh->zoomItY( getOrig().y() + getSize().height() / 2 ) ) );
@@ -58,7 +58,7 @@ void KPrPartObject::rotate( float _angle )
     KPrObject::rotate( _angle );
 
     child->setRotation( _angle );
-    KoTextZoomHandler* zh = child->tqparent()->zoomHandler();
+    KoTextZoomHandler* zh = child->parent()->zoomHandler();
     child->setRotationPoint( TQPoint( zh->zoomItX( getOrig().x() + getSize().width() / 2 ),
                                      zh->zoomItY( getOrig().y() + getSize().height() / 2 ) ) );
 }
@@ -151,7 +151,7 @@ void KPrPartObject::draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler,
 
 void KPrPartObject::slot_changed( KoChild *_koChild )
 {
-    KoTextZoomHandler* zh = child->tqparent()->zoomHandler();
+    KoTextZoomHandler* zh = child->parent()->zoomHandler();
     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 388d7dee5..d67900844 100644
--- a/kpresenter/KPrPenStyleWidget.cpp
+++ b/kpresenter/KPrPenStyleWidget.cpp
@@ -33,8 +33,8 @@
 #include <knuminput.h>
 
 
-KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *tqparent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds )
-: TQWidget( tqparent, name )
+KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds )
+: TQWidget( parent, name )
 , m_pen( pen )
 {
     TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
diff --git a/kpresenter/KPrPenStyleWidget.h b/kpresenter/KPrPenStyleWidget.h
index 7bbd2c01f..19abd8ead 100644
--- a/kpresenter/KPrPenStyleWidget.h
+++ b/kpresenter/KPrPenStyleWidget.h
@@ -36,7 +36,7 @@ class KPrPenStyleWidget : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrPenStyleWidget( TQWidget *tqparent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds = true );
+    KPrPenStyleWidget( TQWidget *parent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds = true );
     ~KPrPenStyleWidget();
 
     int getPenConfigChange() const;
diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp
index 378b89904..a7df156f3 100644
--- a/kpresenter/KPrPgConfDia.cpp
+++ b/kpresenter/KPrPgConfDia.cpp
@@ -47,9 +47,9 @@
 #include <knuminput.h>
 #include <tqslider.h>
 
-KPrPgConfDia::KPrPgConfDia( TQWidget* tqparent, KPrDocument* doc )
+KPrPgConfDia::KPrPgConfDia( TQWidget* parent, KPrDocument* doc )
     : KDialogBase( KDialogBase::Tabbed, i18n("Configure Slide Show"),
-                   Ok|Cancel, Ok, tqparent, "pgConfDia", true ),
+                   Ok|Cancel, Ok, parent, "pgConfDia", true ),
       m_doc( doc )
 {
     setupPageGeneral();
diff --git a/kpresenter/KPrPgConfDia.h b/kpresenter/KPrPgConfDia.h
index d322c6e91..79f13f1f3 100644
--- a/kpresenter/KPrPgConfDia.h
+++ b/kpresenter/KPrPgConfDia.h
@@ -50,7 +50,7 @@ class KPrPgConfDia : public KDialogBase
 public:
 
     // constructor - destructor
-    KPrPgConfDia( TQWidget* tqparent, KPrDocument* doc );
+    KPrPgConfDia( TQWidget* parent, KPrDocument* doc );
     ~KPrPgConfDia();
     bool getInfiniteLoop() const;
     bool getShowEndOfPresentationSlide() const;
diff --git a/kpresenter/KPrPicturePreview.cpp b/kpresenter/KPrPicturePreview.cpp
index 7964b4bcb..a2eafde86 100644
--- a/kpresenter/KPrPicturePreview.cpp
+++ b/kpresenter/KPrPicturePreview.cpp
@@ -27,8 +27,8 @@
 #include <tqpainter.h>
 
 
-KPrPicturePreview::KPrPicturePreview( TQWidget* tqparent, const char* name)
-: TQFrame( tqparent, name )
+KPrPicturePreview::KPrPicturePreview( TQWidget* parent, const char* name)
+: TQFrame( parent, name )
 , mirrorType( PM_NORMAL )
 , depth( 0 )
 , swapRGB( false )
diff --git a/kpresenter/KPrPicturePreview.h b/kpresenter/KPrPicturePreview.h
index 766025e71..a511f2ac3 100644
--- a/kpresenter/KPrPicturePreview.h
+++ b/kpresenter/KPrPicturePreview.h
@@ -34,7 +34,7 @@ class KPrPicturePreview : public TQFrame
   TQ_OBJECT
 
 public:
-    KPrPicturePreview( TQWidget* tqparent, const char* name);
+    KPrPicturePreview( TQWidget* parent, const char* name);
     ~KPrPicturePreview() {}
 
     void setDepth( int depth);
diff --git a/kpresenter/KPrPictureProperty.cpp b/kpresenter/KPrPictureProperty.cpp
index 135cc189f..5e0e6db86 100644
--- a/kpresenter/KPrPictureProperty.cpp
+++ b/kpresenter/KPrPictureProperty.cpp
@@ -28,9 +28,9 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-KPrPictureProperty::KPrPictureProperty( TQWidget *tqparent, const char *name, const TQPixmap &pixmap,
+KPrPictureProperty::KPrPictureProperty( TQWidget *parent, const char *name, const TQPixmap &pixmap,
                                   KPrPictureSettingCmd::PictureSettings pictureSettings )
-: TQWidget( tqparent, name )
+: TQWidget( parent, name )
 , m_pictureSettings( pictureSettings )
 {
     TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
diff --git a/kpresenter/KPrPictureProperty.h b/kpresenter/KPrPictureProperty.h
index 8dc7debef..eb8caa8b9 100644
--- a/kpresenter/KPrPictureProperty.h
+++ b/kpresenter/KPrPictureProperty.h
@@ -33,7 +33,7 @@ class KPrPictureProperty : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrPictureProperty( TQWidget *tqparent, const char *name, const TQPixmap &pixmap,
+    KPrPictureProperty( TQWidget *parent, const char *name, const TQPixmap &pixmap,
                      KPrPictureSettingCmd::PictureSettings pictureSettings );
     ~KPrPictureProperty();
 
diff --git a/kpresenter/KPrPieObject.cpp b/kpresenter/KPrPieObject.cpp
index efbe69534..a830e7038 100644
--- a/kpresenter/KPrPieObject.cpp
+++ b/kpresenter/KPrPieObject.cpp
@@ -232,8 +232,8 @@ void KPrPieObject::paint( TQPainter* _painter, KoTextZoomHandler*_zoomHandler,
                     p.drawPixmap( 0, 0, gradient->pixmap() );
                     p.end();
 
-                    TQBitmap tqmask( size, true );
-                    p.begin( &tqmask );
+                    TQBitmap mask( size, true );
+                    p.begin( &mask );
                     p.setPen( TQPen( TQt::color1 ) );
                     p.setBrush( TQBrush( TQt::color1 ) );
                     if ( pieType == PT_CHORD )
@@ -249,7 +249,7 @@ void KPrPieObject::paint( TQPainter* _painter, KoTextZoomHandler*_zoomHandler,
                                    _zoomHandler->zoomItY( oh - 2 * pw), p_angle, p_len );
                     }
                     p.end();
-                    m_gradientPix.setMask( tqmask );
+                    m_gradientPix.setMask( mask );
                 }
                 _painter->drawPixmap( 0, 0, m_gradientPix, 0, 0, size.width(), size.height() );
                 _painter->setBrush( TQt::NoBrush );
diff --git a/kpresenter/KPrPiePreview.cpp b/kpresenter/KPrPiePreview.cpp
index d7091b26f..e6d4f0207 100644
--- a/kpresenter/KPrPiePreview.cpp
+++ b/kpresenter/KPrPiePreview.cpp
@@ -24,8 +24,8 @@
 
 #include <tqpainter.h>
 
-KPrPiePreview::KPrPiePreview( TQWidget* tqparent, const char* name )
-    : TQFrame( tqparent, name )
+KPrPiePreview::KPrPiePreview( TQWidget* parent, const char* name )
+    : TQFrame( parent, name )
 {
     setFrameStyle( WinPanel | Sunken );
     setBackgroundColor( white );
diff --git a/kpresenter/KPrPiePreview.h b/kpresenter/KPrPiePreview.h
index 8ac068a2a..1f3ca45fe 100644
--- a/kpresenter/KPrPiePreview.h
+++ b/kpresenter/KPrPiePreview.h
@@ -35,7 +35,7 @@ class KPrPiePreview : public TQFrame
   TQ_OBJECT
 
 public:
-    KPrPiePreview( TQWidget* tqparent, const char* );
+    KPrPiePreview( TQWidget* parent, const char* );
     ~KPrPiePreview() {}
 
     void setAngle( int _angle )
diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp
index 449967507..694a9653f 100644
--- a/kpresenter/KPrPieProperty.cpp
+++ b/kpresenter/KPrPieProperty.cpp
@@ -31,8 +31,8 @@
 #include "KPrPiePreview.h"
 
 
-KPrPieProperty::KPrPieProperty( TQWidget *tqparent, const char *name, KPrPieValueCmd::PieValues pieValues )
-: TQWidget( tqparent, name )
+KPrPieProperty::KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueCmd::PieValues pieValues )
+: TQWidget( parent, name )
 , m_pieValues( pieValues )
 {
     TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
diff --git a/kpresenter/KPrPieProperty.h b/kpresenter/KPrPieProperty.h
index 82542fc06..3d89d9618 100644
--- a/kpresenter/KPrPieProperty.h
+++ b/kpresenter/KPrPieProperty.h
@@ -32,7 +32,7 @@ class KPrPieProperty : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrPieProperty( TQWidget *tqparent, const char *name, KPrPieValueCmd::PieValues pieValues );
+    KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueCmd::PieValues pieValues );
     ~KPrPieProperty();
 
     int getPiePropertyChange() const;
diff --git a/kpresenter/KPrPolygonPreview.cpp b/kpresenter/KPrPolygonPreview.cpp
index 114420bca..e41e9c6fe 100644
--- a/kpresenter/KPrPolygonPreview.cpp
+++ b/kpresenter/KPrPolygonPreview.cpp
@@ -27,8 +27,8 @@
 
 #include <math.h>
 
-KPrPolygonPreview::KPrPolygonPreview( TQWidget* tqparent, const char* name)
-    : TQFrame( tqparent, name )
+KPrPolygonPreview::KPrPolygonPreview( TQWidget* parent, const char* name)
+    : TQFrame( parent, name )
 {
     setFrameStyle( WinPanel | Sunken );
     setBackgroundColor( white );
diff --git a/kpresenter/KPrPolygonPreview.h b/kpresenter/KPrPolygonPreview.h
index ce1aa948a..4d6cc248e 100644
--- a/kpresenter/KPrPolygonPreview.h
+++ b/kpresenter/KPrPolygonPreview.h
@@ -36,7 +36,7 @@ class KPrPolygonPreview : public TQFrame
   TQ_OBJECT
 
 public:
-    KPrPolygonPreview( TQWidget* tqparent, const char*);
+    KPrPolygonPreview( TQWidget* parent, const char*);
     ~KPrPolygonPreview() {}
 
     void setPenBrush( const TQPen &_pen, const TQBrush &_brush )
diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp
index d065c6283..fe303a0bc 100644
--- a/kpresenter/KPrPolygonProperty.cpp
+++ b/kpresenter/KPrPolygonProperty.cpp
@@ -29,8 +29,8 @@
 #include "polygonpropertyui.h"
 #include "KPrPolygonPreview.h"
 
-KPrPolygonProperty::KPrPolygonProperty( TQWidget *tqparent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings )
-: TQWidget( tqparent, name )
+KPrPolygonProperty::KPrPolygonProperty( TQWidget *parent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings )
+: TQWidget( parent, name )
 , m_polygonSettings( polygonSettings )
 {
     TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
diff --git a/kpresenter/KPrPolygonProperty.h b/kpresenter/KPrPolygonProperty.h
index 5b41391ef..f5960574a 100644
--- a/kpresenter/KPrPolygonProperty.h
+++ b/kpresenter/KPrPolygonProperty.h
@@ -31,7 +31,7 @@ class KPrPolygonProperty : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrPolygonProperty( TQWidget *tqparent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings );
+    KPrPolygonProperty( TQWidget *parent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings );
     ~KPrPolygonProperty();
 
     int getPolygonPropertyChange() const;
diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp
index c1e7b80fa..88163c62d 100644
--- a/kpresenter/KPrPresDurationDia.cpp
+++ b/kpresenter/KPrPresDurationDia.cpp
@@ -30,10 +30,10 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-KPrPresDurationDia::KPrPresDurationDia( TQWidget *tqparent, const char *name,
+KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name,
                                       KPrDocument *_doc, TQStringList _durationListString,
                                       const TQString &_durationString )
-    : KDialogBase( tqparent, name, false, "", KDialogBase::Close ),
+    : KDialogBase( parent, name, false, "", KDialogBase::Close ),
       doc( _doc )
 {
     m_durationListString = _durationListString;
diff --git a/kpresenter/KPrPresDurationDia.h b/kpresenter/KPrPresDurationDia.h
index 923959948..973397a62 100644
--- a/kpresenter/KPrPresDurationDia.h
+++ b/kpresenter/KPrPresDurationDia.h
@@ -33,7 +33,7 @@ class KPrPresDurationDia : public KDialogBase
   TQ_OBJECT
 
 public:
-    KPrPresDurationDia( TQWidget *tqparent, const char *name,
+    KPrPresDurationDia( TQWidget *parent, const char *name,
                        KPrDocument *_doc,
                        TQStringList _durationListString,
                        const TQString &_durationString );
diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp
index 5e0b573de..3dce55a3d 100644
--- a/kpresenter/KPrPrinterDlg.cpp
+++ b/kpresenter/KPrPrinterDlg.cpp
@@ -32,8 +32,8 @@
 // local includes
 #include "KPrPrinterDlg.h"
 
- KPrPrinterDlg::KPrPrinterDlg( TQWidget *tqparent, const char *name )
-  : KPrintDialogPage( tqparent, name )
+ KPrPrinterDlg::KPrPrinterDlg( TQWidget *parent, const char *name )
+  : KPrintDialogPage( parent, name )
 {
   setTitle( i18n( "KPresenter Options" ) );
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, 11, 6 );
diff --git a/kpresenter/KPrPrinterDlg.h b/kpresenter/KPrPrinterDlg.h
index 404fcf8d2..7a881e38c 100644
--- a/kpresenter/KPrPrinterDlg.h
+++ b/kpresenter/KPrPrinterDlg.h
@@ -35,7 +35,7 @@ class KPrPrinterDlg : public KPrintDialogPage
   TQ_OBJECT
   public:
     /// Getting the common arguments.
-    KPrPrinterDlg( TQWidget *tqparent = 0, const char *name = 0 );
+    KPrPrinterDlg( TQWidget *parent = 0, const char *name = 0 );
 
     /// Reimplemented.
     void getOptions( TQMap<TQString, TQString>& opts, bool include_def = false );
diff --git a/kpresenter/KPrPropertyEditor.cpp b/kpresenter/KPrPropertyEditor.cpp
index 4e8ec38fb..80681763e 100644
--- a/kpresenter/KPrPropertyEditor.cpp
+++ b/kpresenter/KPrPropertyEditor.cpp
@@ -36,8 +36,8 @@
 #include <klocale.h>
 #include <kstdguiitem.h>
 
-KPrPropertyEditor::KPrPropertyEditor( TQWidget *tqparent, const char *name, KPrPage *page, KPrDocument *doc )
-    : TQTabDialog( tqparent, name, true )
+KPrPropertyEditor::KPrPropertyEditor( TQWidget *parent, const char *name, KPrPage *page, KPrDocument *doc )
+    : TQTabDialog( parent, name, true )
     , m_page( page )
     , m_doc( doc )
     , m_objects( page->getSelectedObjects() )
diff --git a/kpresenter/KPrPropertyEditor.h b/kpresenter/KPrPropertyEditor.h
index d6fccd6de..74ab5e814 100644
--- a/kpresenter/KPrPropertyEditor.h
+++ b/kpresenter/KPrPropertyEditor.h
@@ -42,7 +42,7 @@ class KPrPropertyEditor : public TQTabDialog
   TQ_OBJECT
 
 public:
-    KPrPropertyEditor( TQWidget *tqparent = 0, const char *name = 0, KPrPage *page = 0, KPrDocument *doc = 0 );
+    KPrPropertyEditor( TQWidget *parent = 0, const char *name = 0, KPrPage *page = 0, KPrDocument *doc = 0 );
     ~KPrPropertyEditor();
 
     KCommand * getCommand();
diff --git a/kpresenter/KPrRectPreview.cpp b/kpresenter/KPrRectPreview.cpp
index a1f7311ca..6d889d731 100644
--- a/kpresenter/KPrRectPreview.cpp
+++ b/kpresenter/KPrRectPreview.cpp
@@ -23,8 +23,8 @@
 
 #include <tqpainter.h>
 
-KPrRectPreview::KPrRectPreview( TQWidget* tqparent, const char* name )
-    : TQFrame( tqparent, name )
+KPrRectPreview::KPrRectPreview( TQWidget* parent, const char* name )
+    : TQFrame( parent, name )
 {
     setFrameStyle( WinPanel | Sunken );
     setBackgroundColor( white );
diff --git a/kpresenter/KPrRectPreview.h b/kpresenter/KPrRectPreview.h
index 3b91fe33a..bf539132e 100644
--- a/kpresenter/KPrRectPreview.h
+++ b/kpresenter/KPrRectPreview.h
@@ -33,7 +33,7 @@ class KPrRectPreview : public TQFrame
   TQ_OBJECT
 
 public:
-    KPrRectPreview( TQWidget* tqparent, const char* );
+    KPrRectPreview( TQWidget* parent, const char* );
     ~KPrRectPreview() {}
 
     void setRnds( int _rx, int _ry )
diff --git a/kpresenter/KPrRectProperty.cpp b/kpresenter/KPrRectProperty.cpp
index 735736463..2174755b7 100644
--- a/kpresenter/KPrRectProperty.cpp
+++ b/kpresenter/KPrRectProperty.cpp
@@ -29,8 +29,8 @@
 #include <tqtoolbutton.h>
 #include <tqlayout.h>
 
-KPrRectProperty::KPrRectProperty( TQWidget *tqparent, const char *name, KPrRectValueCmd::RectValues &rectValue )
-: TQWidget( tqparent, name )
+KPrRectProperty::KPrRectProperty( TQWidget *parent, const char *name, KPrRectValueCmd::RectValues &rectValue )
+: TQWidget( parent, name )
 , m_rectValue( rectValue )
 {
     formerVerticalValue = 0;
diff --git a/kpresenter/KPrRectProperty.h b/kpresenter/KPrRectProperty.h
index b276d9c98..6e139a91b 100644
--- a/kpresenter/KPrRectProperty.h
+++ b/kpresenter/KPrRectProperty.h
@@ -32,7 +32,7 @@ class KPrRectProperty : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrRectProperty( TQWidget *tqparent, const char *name, KPrRectValueCmd::RectValues &rectValue );
+    KPrRectProperty( TQWidget *parent, const char *name, KPrRectValueCmd::RectValues &rectValue );
     ~KPrRectProperty();
 
     int getRectPropertyChange() const;
diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp
index 6f7516983..4f2d59cae 100644
--- a/kpresenter/KPrRotationDialogImpl.cpp
+++ b/kpresenter/KPrRotationDialogImpl.cpp
@@ -33,8 +33,8 @@
 #include "rotationpropertyui.h"
 #include "KPrTextPreview.h"
 
-KPrRotationDialogImpl::KPrRotationDialogImpl( TQWidget *tqparent, const char* name )
-: KDialogBase( tqparent, name, true, i18n( "Rotation"), Ok|Cancel|Apply, Ok, true )
+KPrRotationDialogImpl::KPrRotationDialogImpl( TQWidget *parent, const char* name )
+: KDialogBase( parent, name, true, i18n( "Rotation"), Ok|Cancel|Apply, Ok, true )
 , m_dialog( new RotationPropertyUI( this, name ) )
 {
     noSignals = false;
@@ -114,8 +114,8 @@ void KPrRotationDialogImpl::angleMode( int angle )
 }
 
 
-KPrCircleToggle::KPrCircleToggle( TQWidget *tqparent, const TQString &image, int id )
-    : TQLabel( tqparent )
+KPrCircleToggle::KPrCircleToggle( TQWidget *parent, const TQString &image, int id )
+    : TQLabel( parent )
 {
     KIconLoader il("kpresenter");
     m_off = il.loadIcon("rotate/" + image, KIcon::NoGroup, 28);
@@ -125,7 +125,7 @@ KPrCircleToggle::KPrCircleToggle( TQWidget *tqparent, const TQString &image, int
     m_id = id;
     setMouseTracking(true);
     setPixmap( m_off );
-    KPrCircleGroup *cg = dynamic_cast<KPrCircleGroup*> (tqparent);
+    KPrCircleGroup *cg = dynamic_cast<KPrCircleGroup*> (parent);
     if(cg != 0)
         cg->add(this);
 }
@@ -143,8 +143,8 @@ void KPrCircleToggle::setChecked(bool on) {
     emit clicked(m_id);
 }
 
-KPrCircleGroup::KPrCircleGroup(TQWidget *tqparent)
-    : TQFrame(tqparent), m_buttons()
+KPrCircleGroup::KPrCircleGroup(TQWidget *parent)
+    : TQFrame(parent), m_buttons()
 {
     noSignals=false;
 }
diff --git a/kpresenter/KPrRotationDialogImpl.h b/kpresenter/KPrRotationDialogImpl.h
index 7741ff76b..e030641b2 100644
--- a/kpresenter/KPrRotationDialogImpl.h
+++ b/kpresenter/KPrRotationDialogImpl.h
@@ -37,7 +37,7 @@ class KPrRotationDialogImpl : public KDialogBase
   TQ_OBJECT
 
 public:
-    KPrRotationDialogImpl( TQWidget *tqparent, const char* name = 0 );
+    KPrRotationDialogImpl( TQWidget *parent, const char* name = 0 );
     ~KPrRotationDialogImpl() {}
 
     void setAngle( double angle );
@@ -68,12 +68,12 @@ class KPrCircleToggle : public TQLabel
 public:
     /**
      * Constructor.
-     * @param tqparent the tqparent widget, as required by TQt.
+     * @param parent the parent widget, as required by TQt.
      * @param image the named image that we will use. "rotate/" is
      *      prepended and "dn" is appended for the checked state.
      * @param id  the id that will be used in the clicked signal
      */
-    KPrCircleToggle(TQWidget *tqparent, const TQString &image, int id);
+    KPrCircleToggle(TQWidget *parent, const TQString &image, int id);
     /// return the id which is passed in the constructor
     int id() { return m_id; }
 
@@ -108,9 +108,9 @@ class KPrCircleGroup : public TQFrame
 public:
     /**
      * Constructor.
-     * @param tqparent the tqparent widget, as required by TQt.
+     * @param parent the parent widget, as required by TQt.
      */
-    KPrCircleGroup(TQWidget *tqparent);
+    KPrCircleGroup(TQWidget *parent);
     /**
      * Set the angle the group is currently representing. If there is a child button
      * that registred itself (using add()) with an ID that matches the argument angle
diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp
index 8fd0cb007..e46e80fdb 100644
--- a/kpresenter/KPrShadowDialogImpl.cpp
+++ b/kpresenter/KPrShadowDialogImpl.cpp
@@ -10,8 +10,8 @@
 #include "KPrShadowDialogImpl.h"
 #include "KPrTextPreview.h"
 
-KPrShadowDialogImpl::KPrShadowDialogImpl( TQWidget *tqparent, const char* name )
-    : ShadowDialogBase( tqparent, name )
+KPrShadowDialogImpl::KPrShadowDialogImpl( TQWidget *parent, const char* name )
+    : ShadowDialogBase( parent, name )
 {
     _preview = new KPrTextPreview( previewPanel );
     TQHBoxLayout *lay = new TQHBoxLayout( previewPanel, previewPanel->lineWidth(), 0 );
diff --git a/kpresenter/KPrShadowDialogImpl.h b/kpresenter/KPrShadowDialogImpl.h
index c6c958766..4f9ffa015 100644
--- a/kpresenter/KPrShadowDialogImpl.h
+++ b/kpresenter/KPrShadowDialogImpl.h
@@ -13,7 +13,7 @@ class KPrShadowDialogImpl : public ShadowDialogBase
   TQ_OBJECT
 
 public:
-    KPrShadowDialogImpl( TQWidget *tqparent, const char* name = 0 );
+    KPrShadowDialogImpl( TQWidget *parent, const char* name = 0 );
     ~KPrShadowDialogImpl() {}
 
     void setShadowDirection( ShadowDirection sd );
diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp
index a1077a17d..b39ab5b06 100644
--- a/kpresenter/KPrSideBar.cpp
+++ b/kpresenter/KPrSideBar.cpp
@@ -69,9 +69,9 @@ TQValidator::State KPrRenamePageValidator::validate( TQString & input, int& ) co
 class ThumbToolTip : public TQToolTip
 {
 public:
-    ThumbToolTip( KPrThumbBar *tqparent )
-        : TQToolTip( tqparent->viewport() )
-        , m_thumbBar( tqparent )
+    ThumbToolTip( KPrThumbBar *parent )
+        : TQToolTip( parent->viewport() )
+        , m_thumbBar( parent )
         {}
 
 protected:
@@ -92,8 +92,8 @@ private:
 class OutlineSlideItem: public KListViewItem
 {
 public:
-    OutlineSlideItem( KListView * tqparent, KPrPage* page, bool _masterPage );
-    OutlineSlideItem( KListView * tqparent, OutlineSlideItem *after, KPrPage* page, bool _masterPage );
+    OutlineSlideItem( KListView * parent, KPrPage* page, bool _masterPage );
+    OutlineSlideItem( KListView * parent, OutlineSlideItem *after, KPrPage* page, bool _masterPage );
 
     KPrPage* page() const { return m_page; }
 
@@ -110,7 +110,7 @@ private:
 class OutlineObjectItem: public KListViewItem
 {
 public:
-    OutlineObjectItem( OutlineSlideItem * tqparent, KPrObject* object,
+    OutlineObjectItem( OutlineSlideItem * parent, KPrObject* object,
                        const TQString& name = TQString() );
 
     KPrObject* object() const { return m_object; }
@@ -124,11 +124,11 @@ private:
 class ThumbItem : public TQIconViewItem
 {
 public:
-    ThumbItem( TQIconView *tqparent, const TQString & text, const TQPixmap & icon )
-        : TQIconViewItem( tqparent, text, icon )
+    ThumbItem( TQIconView *parent, const TQString & text, const TQPixmap & icon )
+        : TQIconViewItem( parent, text, icon )
         { uptodate = true; }
-    ThumbItem( TQIconView *tqparent, TQIconViewItem *after, const TQString & text, const TQPixmap & icon )
-        : TQIconViewItem( tqparent, after, text, icon )
+    ThumbItem( TQIconView *parent, TQIconViewItem *after, const TQString & text, const TQPixmap & icon )
+        : TQIconViewItem( parent, after, text, icon )
         { uptodate = true; }
 
     virtual bool isUptodate() { return uptodate; };
@@ -138,8 +138,8 @@ private:
     bool uptodate;
 };
 
-KPrSideBar::KPrSideBar(TQWidget *tqparent, KPrDocument *d, KPrView *v)
-    :TQTabWidget(tqparent), m_doc(d), m_view(v)
+KPrSideBar::KPrSideBar(TQWidget *parent, KPrDocument *d, KPrView *v)
+    :TQTabWidget(parent), m_doc(d), m_view(v)
 {
     setTabPosition(TQTabWidget::Top);
     setTabShape(TQTabWidget::Triangular);
@@ -233,8 +233,8 @@ void KPrSideBarBase::setViewMasterPage( bool _b )
     m_viewMasterPage = _b;
 }
 
-KPrThumbBar::KPrThumbBar(TQWidget *tqparent, KPrDocument *d, KPrView *v)
-    :KIconView(tqparent), KPrSideBarBase( d,v)
+KPrThumbBar::KPrThumbBar(TQWidget *parent, KPrDocument *d, KPrView *v)
+    :KIconView(parent), KPrSideBarBase( d,v)
 {
     uptodate = false;
     m_offsetX = 0;
@@ -577,16 +577,16 @@ void KPrThumbBar::slotRefreshItems()
     refreshItems();
 }
 
-OutlineSlideItem::OutlineSlideItem( KListView* tqparent, KPrPage* _page, bool _masterPage )
-    : KListViewItem( tqparent ), m_page( _page ), m_masterPage( _masterPage )
+OutlineSlideItem::OutlineSlideItem( KListView* parent, KPrPage* _page, bool _masterPage )
+    : KListViewItem( parent ), m_page( _page ), m_masterPage( _masterPage )
 {
     setDragEnabled(true);
     setPage( _page );
     setPixmap( 0, KPBarIcon( "slide" ) );
 }
 
-OutlineSlideItem::OutlineSlideItem( KListView* tqparent, OutlineSlideItem * after, KPrPage* _page, bool _masterPage )
-    : KListViewItem( tqparent, after ), m_page( _page ), m_masterPage( _masterPage )
+OutlineSlideItem::OutlineSlideItem( KListView* parent, OutlineSlideItem * after, KPrPage* _page, bool _masterPage )
+    : KListViewItem( parent, after ), m_page( _page ), m_masterPage( _masterPage )
 {
     setDragEnabled(true);
     setPage( _page );
@@ -676,9 +676,9 @@ void OutlineSlideItem::updateTitle()
     setText( 0, title );
 }
 
-OutlineObjectItem::OutlineObjectItem( OutlineSlideItem* tqparent, KPrObject* _object,
+OutlineObjectItem::OutlineObjectItem( OutlineSlideItem* parent, KPrObject* _object,
                                       const TQString& name )
-    : KListViewItem( tqparent ), m_object( _object )
+    : KListViewItem( parent ), m_object( _object )
 {
     setObject( m_object );
     setDragEnabled( false );
@@ -755,8 +755,8 @@ void OutlineObjectItem::setObject( KPrObject* object )
     }
 }
 
-KPrOutline::KPrOutline( TQWidget *tqparent, KPrDocument *d, KPrView *v )
-    : KListView( tqparent ), KPrSideBarBase( d, v)
+KPrOutline::KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v )
+    : KListView( parent ), KPrSideBarBase( d, v)
 {
     rebuildItems();
     setSorting( -1 );
@@ -922,7 +922,7 @@ void KPrOutline::itemClicked( TQListViewItem *item )
         if( !object ) return;
 
         // ensure the owner slide is shown first
-        OutlineSlideItem* slideItem = dynamic_cast<OutlineSlideItem*>(objectItem->tqparent());
+        OutlineSlideItem* slideItem = dynamic_cast<OutlineSlideItem*>(objectItem->parent());
         if( slideItem && m_doc->activePage() != slideItem->page() )
         {
             KPrPage* page = slideItem->page();
@@ -946,12 +946,12 @@ void KPrOutline::itemClicked( TQListViewItem *item )
  * When an item is about to move (using drag-and-drop), it makes shure that
  * it's not moved right after an object.
  */
-void KPrOutline::slotDropped( TQDropEvent * /* e */, TQListViewItem *tqparent, TQListViewItem *target )
+void KPrOutline::slotDropped( TQDropEvent * /* e */, TQListViewItem *parent, TQListViewItem *target )
 {
     kdDebug(33001) << "slotDropped" << endl;
-    /* slide doesn't have tqparent (always 0)
+    /* slide doesn't have parent (always 0)
      * Only slides can move at the moment, objects can't. */
-    if ( tqparent )
+    if ( parent )
         return;
 
     // This code is taken from KListView
@@ -969,7 +969,7 @@ void KPrOutline::slotDropped( TQDropEvent * /* e */, TQListViewItem *tqparent, T
         i->setSelected( false );
 
         // don't move the item as it is allready
-        moveItem(i, tqparent, target );
+        moveItem(i, parent, target );
 
         // Only one item can be moved
         break;
@@ -987,7 +987,7 @@ bool KPrOutline::acceptDrag( TQDropEvent* e ) const
 void KPrOutline::setCurrentPage( int pg )
 {
     OutlineSlideItem *item = slideItem( pg );
-    if( item && ( item!=currentItem()->tqparent() ) )
+    if( item && ( item!=currentItem()->parent() ) )
     {
         blockSignals( true );
         setCurrentItem( item );
diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h
index b1d7eeb3d..b6450f110 100644
--- a/kpresenter/KPrSideBar.h
+++ b/kpresenter/KPrSideBar.h
@@ -69,7 +69,7 @@ class KPrThumbBar : public KIconView, public KPrSideBarBase
   TQ_OBJECT
 
 public:
-    KPrThumbBar(TQWidget *tqparent, KPrDocument *d, KPrView *v);
+    KPrThumbBar(TQWidget *parent, KPrDocument *d, KPrView *v);
     ~KPrThumbBar();
     void setCurrentPage( int pg );
     void updateItem( int pagenr, bool sticky = false );
@@ -106,7 +106,7 @@ class KPrOutline: public KListView, public KPrSideBarBase
   TQ_OBJECT
 
 public:
-    KPrOutline( TQWidget *tqparent, KPrDocument *d, KPrView *v );
+    KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v );
     ~KPrOutline();
     void setCurrentPage( int pg );
     TQSize tqsizeHint() const { return TQSize( 145, KListView::tqsizeHint().height() ); }
@@ -134,7 +134,7 @@ public slots:
 
 private slots:
     void itemClicked( TQListViewItem *i );
-    void slotDropped( TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *target );
+    void slotDropped( TQDropEvent *e, TQListViewItem *parent, TQListViewItem *target );
     void rightButtonPressed( TQListViewItem *i, const TQPoint &pnt, int c );
     void slotContextMenu( KListView*, TQListViewItem *item, const TQPoint &p );
 
@@ -148,7 +148,7 @@ class KPrSideBar: public TQTabWidget
   TQ_OBJECT
 
 public:
-    KPrSideBar(TQWidget *tqparent, KPrDocument *d, KPrView *v);
+    KPrSideBar(TQWidget *parent, KPrDocument *d, KPrView *v);
     void setCurrentPage( int pg ) {
         m_outline->setCurrentPage(pg);
         m_thb->setCurrentPage(pg);
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 0f95e03bb..f0b3a05b6 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -43,8 +43,8 @@
 #include "KPrPageEffects.h"
 #include "slidetransitionwidget.h"
 
-KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *tqparent, const char *name, KPrView *view )
-: KDialogBase( tqparent, name, true, i18n( "Slide Transition" ), User1|Ok|Cancel, Ok, true )
+KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name, KPrView *view )
+: KDialogBase( parent, name, true, i18n( "Slide Transition" ), User1|Ok|Cancel, Ok, true )
 , m_dialog( new SlideTransitionWidget( this ) ), m_view( view ), m_soundPlayer(0), m_pageEffect( 0 )
 {
     int pgnum = m_view->getCurrPgNum() - 1;
diff --git a/kpresenter/KPrSlideTransitionDia.h b/kpresenter/KPrSlideTransitionDia.h
index e339b62cb..bd4ee1c77 100644
--- a/kpresenter/KPrSlideTransitionDia.h
+++ b/kpresenter/KPrSlideTransitionDia.h
@@ -40,7 +40,7 @@ class KPrSlideTransitionDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrSlideTransitionDia( TQWidget *tqparent, const char *name, KPrView *view );
+    KPrSlideTransitionDia( TQWidget *parent, const char *name, KPrView *view );
     ~KPrSlideTransitionDia();
 
 protected:
diff --git a/kpresenter/KPrSoundPlayer.cpp b/kpresenter/KPrSoundPlayer.cpp
index 5ec7610a9..0dbd2d4be 100644
--- a/kpresenter/KPrSoundPlayer.cpp
+++ b/kpresenter/KPrSoundPlayer.cpp
@@ -55,8 +55,8 @@ public:
 #endif
 };
 
-KPrSoundPlayer::KPrSoundPlayer( const TQString &fileName, TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+KPrSoundPlayer::KPrSoundPlayer( const TQString &fileName, TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
     d = new KPresenterSoundPlayerPrivate( fileName );
 
diff --git a/kpresenter/KPrSoundPlayer.h b/kpresenter/KPrSoundPlayer.h
index 1f4cc52e1..46683dc8b 100644
--- a/kpresenter/KPrSoundPlayer.h
+++ b/kpresenter/KPrSoundPlayer.h
@@ -47,7 +47,7 @@ class KPrSoundPlayer : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPrSoundPlayer( const TQString &fileName, TQObject *tqparent = 0, const char *name = 0 );
+    KPrSoundPlayer( const TQString &fileName, TQObject *parent = 0, const char *name = 0 );
 
     ~KPrSoundPlayer();
 
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 06b5d5df0..7f665ef7c 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -2365,7 +2365,7 @@ bool KPrTextView::canDecode( TQMimeSource *e )
     return kpTextObject()->kPresenterDocument()->isReadWrite() && ( !KoTextObject::providesOasis( e ).isNull() || TQTextDrag::canDecode( e ) );
 }
 
-TQDragObject * KPrTextView::newDrag( TQWidget * tqparent )
+TQDragObject * KPrTextView::newDrag( TQWidget * parent )
 {
     TQBuffer buffer;
     const TQCString mimeType = "application/vnd.oasis.opendocument.text";
@@ -2415,7 +2415,7 @@ TQDragObject * KPrTextView::newDrag( TQWidget * tqparent )
 
     delete store;
 
-    KMultipleDrag* multiDrag = new KMultipleDrag( tqparent );
+    KMultipleDrag* multiDrag = new KMultipleDrag( parent );
     if (  !plainText.isEmpty() )
         multiDrag->addDragObject( new TQTextDrag( plainText, 0 ) );
     KoStoreDrag* storeDrag = new KoStoreDrag( mimeType, 0 );
diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h
index 41dbe91e6..3bacdb69f 100644
--- a/kpresenter/KPrTextObject.h
+++ b/kpresenter/KPrTextObject.h
@@ -290,7 +290,7 @@ protected slots:
 
 protected:
     bool canDecode( TQMimeSource *e );
-    TQDragObject * newDrag( TQWidget * tqparent );
+    TQDragObject * newDrag( TQWidget * parent );
     // Reimplemented from KoTextView
     virtual void doAutoFormat( KoTextCursor* cursor, KoTextParag *parag, int index, TQChar ch );
     virtual bool doIgnoreDoubleSpace(KoTextParag * parag, int index,TQChar ch );
diff --git a/kpresenter/KPrTextPreview.cpp b/kpresenter/KPrTextPreview.cpp
index 27bb8b5b6..8309fffae 100644
--- a/kpresenter/KPrTextPreview.cpp
+++ b/kpresenter/KPrTextPreview.cpp
@@ -5,8 +5,8 @@
 #include <tqpainter.h>
 #include <tqfont.h>
 
-KPrTextPreview::KPrTextPreview( TQWidget* tqparent, const char* name )
-    : TQFrame( tqparent, name ),
+KPrTextPreview::KPrTextPreview( TQWidget* parent, const char* name )
+    : TQFrame( parent, name ),
       shadowDirection( SD_LEFT_BOTTOM ),
       shadowDistance( 0 ),
       angle( 0 )
diff --git a/kpresenter/KPrTextPreview.h b/kpresenter/KPrTextPreview.h
index b49142513..f25d6987d 100644
--- a/kpresenter/KPrTextPreview.h
+++ b/kpresenter/KPrTextPreview.h
@@ -10,7 +10,7 @@ class KPrTextPreview : public TQFrame
   TQ_OBJECT
 
 public:
-    KPrTextPreview( TQWidget* tqparent, const char* name = 0 );
+    KPrTextPreview( TQWidget* parent, const char* name = 0 );
     ~KPrTextPreview() {}
 
     void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; tqrepaint( true ); }
diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp
index 850c89b47..6708065b7 100644
--- a/kpresenter/KPrTextProperty.cpp
+++ b/kpresenter/KPrTextProperty.cpp
@@ -31,9 +31,9 @@
 #include "KPrMarginWidget.h"
 
 
-KPrTextProperty::KPrTextProperty( TQWidget *tqparent, const char *name, const MarginsStruct &marginsStruct,
+KPrTextProperty::KPrTextProperty( TQWidget *parent, const char *name, const MarginsStruct &marginsStruct,
                             const KoUnit::Unit unit, PropValue protectContent )
-: TQWidget( tqparent, name )
+: TQWidget( parent, name )
 , m_unit( unit )
 , m_protectContent( protectContent )
 {
diff --git a/kpresenter/KPrTextProperty.h b/kpresenter/KPrTextProperty.h
index ec19483fd..c30eeded2 100644
--- a/kpresenter/KPrTextProperty.h
+++ b/kpresenter/KPrTextProperty.h
@@ -43,7 +43,7 @@ public:
         Margins = 2
     };
 
-    KPrTextProperty( TQWidget *tqparent, const char *name, const MarginsStruct &marginsStruct,
+    KPrTextProperty( TQWidget *parent, const char *name, const MarginsStruct &marginsStruct,
                   const KoUnit::Unit unit, PropValue protectContent );
     ~KPrTextProperty();
 
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index 2d3058414..a7fc0899e 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -55,8 +55,8 @@
 #include <kfiledialog.h>
 
 
-KPrEffectPreview::KPrEffectPreview( TQWidget *tqparent, KPrDocument *_doc, KPrView *_view )
-    : TQLabel( tqparent ), doc( _doc ), view( _view ), m_pageEffect( 0 )
+KPrEffectPreview::KPrEffectPreview( TQWidget *parent, KPrDocument *_doc, KPrView *_view )
+    : TQLabel( parent ), doc( _doc ), view( _view ), m_pageEffect( 0 )
 {
     setFrameStyle( StyledPanel | Sunken );
 }
@@ -142,9 +142,9 @@ void KPrEffectPreview::slotDoPageEffect()
 }
 
 
-KPrTransEffectDia::KPrTransEffectDia( TQWidget *tqparent, const char *name,
+KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
                                     KPrDocument *_doc, KPrView *_view )
-    : KDialogBase( tqparent, name, true, "", KDialogBase::User1|Ok|Cancel ),
+    : KDialogBase( parent, name, true, "", KDialogBase::User1|Ok|Cancel ),
       doc( _doc ), view( _view ), soundPlayer( 0 )
 {
     enableButtonSeparator( true );
diff --git a/kpresenter/KPrTransEffectDia.h b/kpresenter/KPrTransEffectDia.h
index b6018d432..3091f038a 100644
--- a/kpresenter/KPrTransEffectDia.h
+++ b/kpresenter/KPrTransEffectDia.h
@@ -52,7 +52,7 @@ class KPrEffectPreview : public TQLabel
   TQ_OBJECT
 
 public:
-    KPrEffectPreview( TQWidget *tqparent, KPrDocument *_doc, KPrView *_view );
+    KPrEffectPreview( TQWidget *parent, KPrDocument *_doc, KPrView *_view );
 
 public slots:
     void setPixmap( const TQPixmap& pixmap );
@@ -78,7 +78,7 @@ class KPrTransEffectDia: public KDialogBase
   TQ_OBJECT
 
 public:
-    KPrTransEffectDia( TQWidget *tqparent, const char *name,
+    KPrTransEffectDia( TQWidget *parent, const char *name,
                       KPrDocument *_doc, KPrView *_view );
 
     PageEffect getPageEffect() const { return pageEffect; }
diff --git a/kpresenter/KPrUtils.cpp b/kpresenter/KPrUtils.cpp
index fbf91cc92..fa21141ac 100644
--- a/kpresenter/KPrUtils.cpp
+++ b/kpresenter/KPrUtils.cpp
@@ -345,10 +345,10 @@ TQCursor KPrUtils::penCursor()
         0x7c, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap pen_bitmap( 24, 24, pen_bits, true );
-    TQBitmap pen_tqmask( 24, 24 );
+    TQBitmap pen_mask( 24, 24 );
     TQPixmap pix( pen_bitmap );
-    pen_tqmask = pix.createHeuristicMask( false );
-    pix.setMask( pen_tqmask );
+    pen_mask = pix.createHeuristicMask( false );
+    pix.setMask( pen_mask );
 
     return TQCursor( pix, 1, 22 );
 }
@@ -364,10 +364,10 @@ TQCursor KPrUtils::rotateCursor()
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap rotate_bitmap( 22, 22, rotate_bits, true );
-    TQBitmap rotate_tqmask( 22, 22 );
+    TQBitmap rotate_mask( 22, 22 );
     TQPixmap pix( rotate_bitmap );
-    rotate_tqmask = pix.createHeuristicMask( false );
-    pix.setMask( rotate_tqmask );
+    rotate_mask = pix.createHeuristicMask( false );
+    pix.setMask( rotate_mask );
 
     return TQCursor( pix, 11, 13 );
 }
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index f3bc053de..ab184148d 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -6421,7 +6421,7 @@ void KPrView::initialLayoutOfSplitter()
         return;
     }
 
-    TQSplitter* splitterVertical = static_cast<TQSplitter*>( TQT_TQWIDGET(notebar->tqparent()) );
+    TQSplitter* splitterVertical = static_cast<TQSplitter*>( TQT_TQWIDGET(notebar->parent()) );
     TQValueList<int> tmpList;
     int noteHeight = height() / 25;
     tmpList << height() - noteHeight << noteHeight;
diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h
index ecfb736e2..1fc3cc7e2 100644
--- a/kpresenter/KPrView.h
+++ b/kpresenter/KPrView.h
@@ -105,7 +105,7 @@ namespace KSpell2 {
 class PageBase : public TQWidget
 {
 public:
-    PageBase( TQWidget *tqparent, KPrView *v ) : TQWidget( tqparent ), view( v ) {}
+    PageBase( TQWidget *parent, KPrView *v ) : TQWidget( parent ), view( v ) {}
     void resizeEvent( TQResizeEvent *e );
 
 private:
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 957e07f26..aa68e58ef 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -1289,7 +1289,7 @@ void KPrWebPresentationCreateDialog::saveConfig()
         filename = TQString();
 
     KFileDialog fd (filename, i18n("*.kpweb|KPresenter Web-Presentation (*.kpweb)"),
-                    0/*tqparent*/, 0/*name*/, true/*modal*/);
+                    0/*parent*/, 0/*name*/, true/*modal*/);
     fd.setCaption (i18n ("Save Web Presentation Configuration"));
     fd.setOperationMode (KFileDialog::Saving);
     fd.setMode (KFile::File | KFile::LocalOnly);
diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp
index 64268e280..ccbfc0e85 100644
--- a/kpresenter/autoformEdit/AFChoose.cpp
+++ b/kpresenter/autoformEdit/AFChoose.cpp
@@ -34,8 +34,8 @@
 
 #include <KPrFactory.h>
 
-AFChoose::AFChoose(TQWidget *tqparent, const TQString &caption, const char *name)
-    : TQTabDialog(tqparent,name,true)
+AFChoose::AFChoose(TQWidget *parent, const TQString &caption, const char *name)
+    : TQTabDialog(parent,name,true)
 {
     setCaption(caption);
     setCancelButton(i18n("&Cancel"));
diff --git a/kpresenter/autoformEdit/AFChoose.h b/kpresenter/autoformEdit/AFChoose.h
index d109059d4..c76a7302d 100644
--- a/kpresenter/autoformEdit/AFChoose.h
+++ b/kpresenter/autoformEdit/AFChoose.h
@@ -37,7 +37,7 @@ class AFChoose : public TQTabDialog
 public:
 
     // constructor - destructor
-    AFChoose(TQWidget *tqparent=0, const TQString &caption=TQString(), const char *name=0);
+    AFChoose(TQWidget *parent=0, const TQString &caption=TQString(), const char *name=0);
     ~AFChoose();
 
 private:
diff --git a/kspread/KSpreadTableIface.cc b/kspread/KSpreadTableIface.cc
index b2f31f611..e60676392 100644
--- a/kspread/KSpreadTableIface.cc
+++ b/kspread/KSpreadTableIface.cc
@@ -132,7 +132,7 @@ void SheetIface::sheetNameHasChanged() {
     while (currentObj != 0L) {
         ident.prepend( currentObj->name() );
         ident.prepend("/");
-        currentObj = currentObj->tqparent();
+        currentObj = currentObj->parent();
     }
     if ( ident[0] == '/' )
         ident = ident.mid(1);
diff --git a/kspread/OASIS.txt b/kspread/OASIS.txt
index d0dfb9d5e..2eb878c8a 100644
--- a/kspread/OASIS.txt
+++ b/kspread/OASIS.txt
@@ -156,29 +156,29 @@ Merged cells
      <table:covered-table-cell table:style-name="ce3"/>
 
 Cell horizontal tqalignment: top
-    <style:style style:name="ce1" style:family="table-cell" style:tqparent-style-name="Default">
+    <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:vertical-align="top"/>
     </style:style>
 
 Cell horizontal tqalignment: middle
-    <style:style style:name="ce2" style:family="table-cell" style:tqparent-style-name="Default">
+    <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:vertical-align="middle"/>
     </style:style>
 
 Cell horizontal tqalignment: bottom
-    <style:style style:name="ce3" style:family="table-cell" style:tqparent-style-name="Default">
+    <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:vertical-align="bottom"/>
     </style:style>
 
 Cell vertical tqalignment: top
-    <style:style style:name="ce5" style:family="table-cell" style:tqparent-style-name="Default">
+    <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties fo:text-align="center" 
       style:text-align-source="fix" style:repeat-content="none" 
       fo:margin-left="0in" style:vertical-align="top"/>
     </style:style>
 
 Cell vertical tqalignment: middle
-    <style:style style:name="ce6" style:family="table-cell" style:tqparent-style-name="Default">
+    <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" 
       fo:margin-left="0in" style:vertical-align="middle"/>
@@ -186,13 +186,13 @@ Cell vertical tqalignment: middle
 
 
 Cell vertical tqalignment: bottom
-    <style:style style:name="ce7" style:family="table-cell" style:tqparent-style-name="Default">
+    <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" 
       fo:margin-left="0in" style:vertical-align="bottom"/>
     </style:style>
 
-    <style:style style:name="Heading" style:family="table-cell" style:tqparent-style-name="Default">
+    <style:style style:name="Heading" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
       <style:paragraph-properties fo:text-align="center"/>
       <style:text-properties fo:font-size="16pt" fo:font-style="italic" fo:font-weight="bold"/>
@@ -200,7 +200,7 @@ Cell vertical tqalignment: bottom
 
 
 Unprotected cell
-    <style:style style:name="ce1" style:family="table-cell" style:tqparent-style-name="Default">
+    <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:cell-protect="none" 
       style:print-content="true"/>
     </style:style>
diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc
index dc633c553..7c97f6c22 100644
--- a/kspread/dialogs/kspread_dlg_angle.cc
+++ b/kspread/dialogs/kspread_dlg_angle.cc
@@ -38,10 +38,10 @@
 
 using namespace KSpread;
 
-AngleDialog::AngleDialog(View* tqparent, const char* name, const TQPoint &_marker)
-	: KDialogBase( tqparent, name,TRUE,i18n("Change Angle" ), Ok|Cancel|Default )
+AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker)
+	: KDialogBase( parent, name,TRUE,i18n("Change Angle" ), Ok|Cancel|Default )
 {
-  m_pView=tqparent;
+  m_pView=parent;
   marker=_marker;
 
   TQWidget *page = new TQWidget( this );
diff --git a/kspread/dialogs/kspread_dlg_angle.h b/kspread/dialogs/kspread_dlg_angle.h
index 26ce07e1f..6d3c0c8d6 100644
--- a/kspread/dialogs/kspread_dlg_angle.h
+++ b/kspread/dialogs/kspread_dlg_angle.h
@@ -37,7 +37,7 @@ class AngleDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  AngleDialog( View* tqparent,const char* name,const TQPoint &_marker);
+  AngleDialog( View* parent,const char* name,const TQPoint &_marker);
 
 public slots:
   void slotOk();
diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc
index 880b357be..9a78074ba 100644
--- a/kspread/dialogs/kspread_dlg_area.cc
+++ b/kspread/dialogs/kspread_dlg_area.cc
@@ -37,10 +37,10 @@
 
 using namespace KSpread;
 
-AreaDialog::AreaDialog( View * tqparent, const char * name, const TQPoint & _marker )
-  : KDialogBase( tqparent, name, TRUE, i18n("Area Name"), Ok | Cancel )
+AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marker )
+  : KDialogBase( parent, name, TRUE, i18n("Area Name"), Ok | Cancel )
 {
-  m_pView  = tqparent;
+  m_pView  = parent;
   m_marker = _marker;
 
   TQWidget * page = new TQWidget( this );
diff --git a/kspread/dialogs/kspread_dlg_area.h b/kspread/dialogs/kspread_dlg_area.h
index 6236cf85e..176d33773 100644
--- a/kspread/dialogs/kspread_dlg_area.h
+++ b/kspread/dialogs/kspread_dlg_area.h
@@ -39,7 +39,7 @@ class AreaDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  AreaDialog( View * tqparent, const char * name, const TQPoint & _marker );
+  AreaDialog( View * parent, const char * name, const TQPoint & _marker );
 
 public slots:
   void slotOk();
diff --git a/kspread/dialogs/kspread_dlg_comment.cc b/kspread/dialogs/kspread_dlg_comment.cc
index 603ceae54..9ed3c5512 100644
--- a/kspread/dialogs/kspread_dlg_comment.cc
+++ b/kspread/dialogs/kspread_dlg_comment.cc
@@ -38,10 +38,10 @@
 
 using namespace KSpread;
 
-CommentDialog::CommentDialog( View* tqparent, const char* name,const TQPoint &_marker)
-	: KDialogBase( tqparent, name,TRUE,i18n("Cell Comment"),Ok|Cancel )
+CommentDialog::CommentDialog( View* parent, const char* name,const TQPoint &_marker)
+	: KDialogBase( parent, name,TRUE,i18n("Cell Comment"),Ok|Cancel )
 {
-    m_pView = tqparent;
+    m_pView = parent;
     marker= _marker;
     TQWidget *page = new TQWidget( this );
     setMainWidget(page);
diff --git a/kspread/dialogs/kspread_dlg_comment.h b/kspread/dialogs/kspread_dlg_comment.h
index e44aed81a..296ec3664 100644
--- a/kspread/dialogs/kspread_dlg_comment.h
+++ b/kspread/dialogs/kspread_dlg_comment.h
@@ -39,7 +39,7 @@ class CommentDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  CommentDialog( View* tqparent, const char* name,const TQPoint &_marker );
+  CommentDialog( View* parent, const char* name,const TQPoint &_marker );
 
 public slots:
   void slotOk();
diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc
index b19900c1c..531f2ee3d 100644
--- a/kspread/dialogs/kspread_dlg_conditional.cc
+++ b/kspread/dialogs/kspread_dlg_conditional.cc
@@ -47,8 +47,8 @@
 
 using namespace KSpread;
 
-ConditionalWidget::ConditionalWidget( TQWidget* tqparent, const char* name, WFlags fl )
-    : TQWidget( tqparent, name, fl )
+ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags fl )
+    : TQWidget( parent, name, fl )
 {
   TQGridLayout * Form1Layout = new TQGridLayout( this, 1, 1, 11, 6, "Form1Layout");
 
@@ -276,11 +276,11 @@ void ConditionalWidget::slotTextChanged3( const TQString & text )
  * ConditionalDialog
  * Sets conditional cell formattings.
  */
-ConditionalDialog::ConditionalDialog( View * tqparent, const char * name,
+ConditionalDialog::ConditionalDialog( View * parent, const char * name,
                                               const TQRect & marker )
-  : KDialogBase( tqparent, name, true, "", KDialogBase::Ok | KDialogBase::Cancel,
+  : KDialogBase( parent, name, true, "", KDialogBase::Ok | KDialogBase::Cancel,
                  KDialogBase::Ok, false ),
-    m_view( tqparent ),
+    m_view( parent ),
     m_dlg( new ConditionalWidget( this ) ),
     m_marker( marker )
 {
diff --git a/kspread/dialogs/kspread_dlg_conditional.h b/kspread/dialogs/kspread_dlg_conditional.h
index 9ecba7be8..d57e262cc 100644
--- a/kspread/dialogs/kspread_dlg_conditional.h
+++ b/kspread/dialogs/kspread_dlg_conditional.h
@@ -42,7 +42,7 @@ class ConditionalWidget : public TQWidget
   TQ_OBJECT
 
  public:
-  ConditionalWidget( TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0 );
+  ConditionalWidget( TQWidget * parent = 0, const char * name = 0, WFlags fl = 0 );
   ~ConditionalWidget();
 
   TQComboBox * m_condition_1;
@@ -72,7 +72,7 @@ class ConditionalDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
  public:
-  ConditionalDialog( View * tqparent, const char * name,
+  ConditionalDialog( View * parent, const char * name,
                          const TQRect & marker );
 
   void init();
diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc
index 16b0ebbb0..91589f9f1 100644
--- a/kspread/dialogs/kspread_dlg_cons.cc
+++ b/kspread/dialogs/kspread_dlg_cons.cc
@@ -54,10 +54,10 @@
 
 using namespace KSpread;
 
-ConsolidateDialog::ConsolidateDialog( View* tqparent, const char* name )
-	: KDialogBase( tqparent, name, false, i18n("Consolidate"), Ok|Cancel )
+ConsolidateDialog::ConsolidateDialog( View* parent, const char* name )
+	: KDialogBase( parent, name, false, i18n("Consolidate"), Ok|Cancel )
 {
-  m_pView = tqparent;
+  m_pView = parent;
 
   TQWidget* page = new TQWidget( this );
   setMainWidget( page );
diff --git a/kspread/dialogs/kspread_dlg_cons.h b/kspread/dialogs/kspread_dlg_cons.h
index b845f00f1..e1315132e 100644
--- a/kspread/dialogs/kspread_dlg_cons.h
+++ b/kspread/dialogs/kspread_dlg_cons.h
@@ -48,7 +48,7 @@ class ConsolidateDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  ConsolidateDialog( View* tqparent, const char* name );
+  ConsolidateDialog( View* parent, const char* name );
   ~ConsolidateDialog();
   TQStringList refs();
 
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index ed1bf44f7..c8ce26715 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -49,9 +49,9 @@
 
 using namespace KSpread;
 
-CSVDialog::CSVDialog( View * tqparent, const char * name, TQRect const & rect, Mode mode)
-  : KDialogBase( tqparent, name, true, TQString(), Ok|Cancel ),
-    m_pView( tqparent ),
+CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mode mode)
+  : KDialogBase( parent, name, true, TQString(), Ok|Cancel ),
+    m_pView( parent ),
     m_cancelled( false ),
     m_adjustRows( 0 ),
     m_startline( 0 ),
diff --git a/kspread/dialogs/kspread_dlg_csv.h b/kspread/dialogs/kspread_dlg_csv.h
index 1da658386..56f7a1b60 100644
--- a/kspread/dialogs/kspread_dlg_csv.h
+++ b/kspread/dialogs/kspread_dlg_csv.h
@@ -62,7 +62,7 @@ class CSVDialog : public KDialogBase
   enum Mode { Clipboard, File, Column };
   enum Header { TEXT, NUMBER, DATE, CURRENCY };
 
-  CSVDialog( View * tqparent, const char * name, TQRect const & rect, Mode mode);
+  CSVDialog( View * parent, const char * name, TQRect const & rect, Mode mode);
 
   ~CSVDialog();
 
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc
index 7aa5dfa9d..b5c66752f 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -62,10 +62,10 @@ using namespace KSpread;
  *                 Database wizard                      *
  ********************************************************/
 
-DatabaseDialog::DatabaseDialog( View * tqparent, TQRect const & rect, const char * name, bool modal, WFlags fl )
-  : KWizard( (TQWidget *) tqparent, name, modal, fl ),
+DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * name, bool modal, WFlags fl )
+  : KWizard( (TQWidget *) parent, name, modal, fl ),
     m_currentPage( eDatabase ),
-    m_pView( tqparent ),
+    m_pView( parent ),
     m_targetRect( rect ),
     m_dbConnection( 0L )
 {
diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h
index d2e921fe5..6e82adc30 100644
--- a/kspread/dialogs/kspread_dlg_database.h
+++ b/kspread/dialogs/kspread_dlg_database.h
@@ -55,7 +55,7 @@ class DatabaseDialog : public KWizard
  public:
   enum PageId { eDatabase = 0, eSheets = 1, eColumns = 2, eOptions = 3, eResult = 4 };
 
-  DatabaseDialog( View * tqparent, TQRect const & rect, const char * name = 0, bool modal = FALSE, WFlags fl = 0 );
+  DatabaseDialog( View * parent, TQRect const & rect, const char * name = 0, bool modal = FALSE, WFlags fl = 0 );
   virtual ~DatabaseDialog();
 
  private slots:
diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc
index 954e0a5c9..d63bfd690 100644
--- a/kspread/dialogs/kspread_dlg_find.cc
+++ b/kspread/dialogs/kspread_dlg_find.cc
@@ -28,15 +28,15 @@
 
 using namespace KSpread;
 
-FindOption::FindOption( TQWidget *tqparent)
+FindOption::FindOption( TQWidget *parent)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent);
-    m_moreOptions = new TQPushButton( i18n( "More Options" ), tqparent );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(parent);
+    m_moreOptions = new TQPushButton( i18n( "More Options" ), parent );
     tqlayout->addWidget(  m_moreOptions );
 
     connect( m_moreOptions, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slotMoreOptions() ) );
 
-    m_findExtension = new TQWidget( tqparent );
+    m_findExtension = new TQWidget( parent );
     tqlayout->addWidget( m_findExtension );
     TQVBoxLayout *tqlayout1 = new TQVBoxLayout( m_findExtension );
     m_searchInAllSheet = new TQCheckBox( i18n( "Search entire sheet" ),m_findExtension );
@@ -115,8 +115,8 @@ bool FindOption::searchInAllSheet() const
     return m_searchInAllSheet->isChecked();
 }
 
-FindDlg::FindDlg(TQWidget *tqparent, const char *name, long options, const TQStringList &findStrings, bool hasSelection )
-    : KFindDialog(tqparent,name,options,findStrings,hasSelection  )
+FindDlg::FindDlg(TQWidget *parent, const char *name, long options, const TQStringList &findStrings, bool hasSelection )
+    : KFindDialog(parent,name,options,findStrings,hasSelection  )
 {
     m_findOptions = new FindOption( findExtension() );
     connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) );
@@ -139,8 +139,8 @@ bool FindDlg::searchInAllSheet() const
 }
 
 
-SearchDlg::SearchDlg(TQWidget *tqparent, const char *name, long options, const TQStringList &findStrings, const TQStringList &replaceStrings, bool hasSelection )
-    : KReplaceDialog(tqparent,name,options,findStrings,replaceStrings,hasSelection  )
+SearchDlg::SearchDlg(TQWidget *parent, const char *name, long options, const TQStringList &findStrings, const TQStringList &replaceStrings, bool hasSelection )
+    : KReplaceDialog(parent,name,options,findStrings,replaceStrings,hasSelection  )
 {
     m_findOptions = new FindOption( findExtension() );
     connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) );
diff --git a/kspread/dialogs/kspread_dlg_find.h b/kspread/dialogs/kspread_dlg_find.h
index d0f35f754..d952b254b 100644
--- a/kspread/dialogs/kspread_dlg_find.h
+++ b/kspread/dialogs/kspread_dlg_find.h
@@ -37,7 +37,7 @@ class FindOption : public TQObject
   Q_OBJECT
   TQ_OBJECT
  public:
-    FindOption( TQWidget *tqparent);
+    FindOption( TQWidget *parent);
     bool searchInAllSheet() const;
 
     enum searchTypeValue { Value, Note};
@@ -66,7 +66,7 @@ class FindDlg : public KFindDialog
   TQ_OBJECT
 
  public:
-    FindDlg( TQWidget *tqparent = 0, const char *name = 0, long options = 0, const TQStringList &findStrings = TQStringList(), bool hasSelection = false );
+    FindDlg( TQWidget *parent = 0, const char *name = 0, long options = 0, const TQStringList &findStrings = TQStringList(), bool hasSelection = false );
     ~FindDlg();
     bool searchInAllSheet() const;
     FindOption::searchTypeValue searchType() const { return m_findOptions->searchType(); }
@@ -84,7 +84,7 @@ class SearchDlg : public KReplaceDialog
   TQ_OBJECT
 
  public:
-    SearchDlg( TQWidget *tqparent = 0, const char *name = 0, long options = 0, const TQStringList &findStrings = TQStringList(), const TQStringList &replaceStrings = TQStringList(), bool hasSelection = false );
+    SearchDlg( TQWidget *parent = 0, const char *name = 0, long options = 0, const TQStringList &findStrings = TQStringList(), const TQStringList &replaceStrings = TQStringList(), bool hasSelection = false );
     ~SearchDlg();
     bool searchInAllSheet() const;
     FindOption::searchTypeValue searchType() const { return m_findOptions->searchType(); }
diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc
index d8d7e9d7b..62e637f51 100644
--- a/kspread/dialogs/kspread_dlg_formula.cc
+++ b/kspread/dialogs/kspread_dlg_formula.cc
@@ -53,12 +53,12 @@
 
 using namespace KSpread;
 
-FormulaDialog::FormulaDialog( View* tqparent, const char* name,const TQString& formulaName)
-    : KDialogBase( tqparent, name,false,i18n("Function"), Ok|Cancel )
+FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& formulaName)
+    : KDialogBase( parent, name,false,i18n("Function"), Ok|Cancel )
 {
   setWFlags( TQt::WDestructiveClose );
 
-    m_pView = tqparent;
+    m_pView = parent;
     m_focus = 0;
     m_desc = 0;
 
diff --git a/kspread/dialogs/kspread_dlg_formula.h b/kspread/dialogs/kspread_dlg_formula.h
index 62ffef199..8e3cb2571 100644
--- a/kspread/dialogs/kspread_dlg_formula.h
+++ b/kspread/dialogs/kspread_dlg_formula.h
@@ -52,7 +52,7 @@ class FormulaDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-  FormulaDialog( View* tqparent, const char* name,const TQString& formulaName=0);
+  FormulaDialog( View* parent, const char* name,const TQString& formulaName=0);
   ~FormulaDialog();
 private:
     /**
diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc
index beae8437d..8902cf6cb 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.cc
+++ b/kspread/dialogs/kspread_dlg_goalseek.cc
@@ -54,10 +54,10 @@
 
 using namespace KSpread;
 
-GoalSeekDialog::GoalSeekDialog( View * tqparent,  TQPoint const & marker,
+GoalSeekDialog::GoalSeekDialog( View * parent,  TQPoint const & marker,
                                         const char * name, bool, WFlags fl )
-  : KDialog( tqparent, name, false, fl ),
-    m_pView( tqparent ),
+  : KDialog( parent, name, false, fl ),
+    m_pView( parent ),
     m_maxIter( 1000 ),
     m_restored( true ),
     m_focus(0),
diff --git a/kspread/dialogs/kspread_dlg_goalseek.h b/kspread/dialogs/kspread_dlg_goalseek.h
index b3b01f199..9771edaa5 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.h
+++ b/kspread/dialogs/kspread_dlg_goalseek.h
@@ -51,7 +51,7 @@ class GoalSeekDialog : public KDialog
   TQ_OBJECT
 
  public:
-   GoalSeekDialog( View * tqparent, TQPoint const & marker, const char * name = 0,
+   GoalSeekDialog( View * parent, TQPoint const & marker, const char * name = 0,
                       bool modal = FALSE, WFlags fl = 0 );
    ~GoalSeekDialog();
 
diff --git a/kspread/dialogs/kspread_dlg_goto.cc b/kspread/dialogs/kspread_dlg_goto.cc
index 457dc80c3..2d9935ac2 100644
--- a/kspread/dialogs/kspread_dlg_goto.cc
+++ b/kspread/dialogs/kspread_dlg_goto.cc
@@ -38,10 +38,10 @@
 
 using namespace KSpread;
 
-GotoDialog::GotoDialog( View* tqparent, const char* name )
-	: KDialogBase( tqparent, name, TRUE, i18n("Goto Cell"), Ok|Cancel )
+GotoDialog::GotoDialog( View* parent, const char* name )
+	: KDialogBase( parent, name, TRUE, i18n("Goto Cell"), Ok|Cancel )
 {
-  m_pView = tqparent;
+  m_pView = parent;
   TQWidget *page = new TQWidget( this );
   setMainWidget(page);
   TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() );
diff --git a/kspread/dialogs/kspread_dlg_goto.h b/kspread/dialogs/kspread_dlg_goto.h
index 702269717..815746c3f 100644
--- a/kspread/dialogs/kspread_dlg_goto.h
+++ b/kspread/dialogs/kspread_dlg_goto.h
@@ -39,7 +39,7 @@ class GotoDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  GotoDialog( View* tqparent, const char* name);
+  GotoDialog( View* parent, const char* name);
 
 public slots:
   void slotOk();
diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc
index 1cca23ca5..8cd3f89f9 100644
--- a/kspread/dialogs/kspread_dlg_insert.cc
+++ b/kspread/dialogs/kspread_dlg_insert.cc
@@ -42,10 +42,10 @@
 
 using namespace KSpread;
 
-InsertDialog::InsertDialog( View* tqparent, const char* name,const TQRect &_rect,Mode _mode)
-	: KDialogBase( tqparent, name, TRUE,"",Ok|Cancel )
+InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,Mode _mode)
+	: KDialogBase( parent, name, TRUE,"",Ok|Cancel )
 {
-  m_pView = tqparent;
+  m_pView = parent;
   rect=_rect;
   insRem=_mode;
 
diff --git a/kspread/dialogs/kspread_dlg_insert.h b/kspread/dialogs/kspread_dlg_insert.h
index 27a961acf..05482cfde 100644
--- a/kspread/dialogs/kspread_dlg_insert.h
+++ b/kspread/dialogs/kspread_dlg_insert.h
@@ -45,7 +45,7 @@ class InsertDialog : public KDialogBase
 public:
     enum Mode { Insert, Remove };
 
-    InsertDialog( View* tqparent, const char* name, const TQRect &_rect, Mode _mode );
+    InsertDialog( View* parent, const char* name, const TQRect &_rect, Mode _mode );
 
 public slots:
     void slotOk();
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index 8c21d75a9..53942457b 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -73,8 +73,8 @@ using namespace KSpread;
  *
  ***************************************************************************/
 
-PatternSelect::PatternSelect( TQWidget *tqparent, const char * )
-  : TQFrame( tqparent )
+PatternSelect::PatternSelect( TQWidget *parent, const char * )
+  : TQFrame( parent )
 {
     penStyle = Qt::NoPen;
     penWidth = 1;
@@ -147,8 +147,8 @@ void PatternSelect::slotSelect()
  *
  ***************************************************************************/
 
-GeneralTab::GeneralTab( TQWidget* tqparent, CellFormatDialog * dlg )
-  : TQWidget( tqparent ),
+GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
+  : TQWidget( parent ),
     m_dlg( dlg )
 {
   TQGridLayout * tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "tqlayout");
@@ -181,7 +181,7 @@ GeneralTab::GeneralTab( TQWidget* tqparent, CellFormatDialog * dlg )
   tmp.remove( m_dlg->styleName );
   m_parentBox->insertStringList( tmp );
 
-  if ( m_dlg->getStyle()->tqparent() )
+  if ( m_dlg->getStyle()->parent() )
     m_parentBox->setCurrentText( m_dlg->getStyle()->parentName() );
   else
   {
@@ -230,7 +230,7 @@ void GeneralTab::slotNewParent( const TQString & parentName )
   else
     m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( parentName ) );
 
-  // Set difference to new tqparent, set GUI to tqparent values, add changes made before
+  // Set difference to new parent, set GUI to parent values, add changes made before
   //  m_dlg->initGUI();
 }
 
@@ -270,7 +270,7 @@ bool GeneralTab::checkParent( const TQString & parentName )
 
     if ( !p )
     {
-      KMessageBox::sorry( this, i18n( "The tqparent style does not exist." ) );
+      KMessageBox::sorry( this, i18n( "The parent style does not exist." ) );
       return false;
     }
   }
@@ -766,9 +766,9 @@ void CellFormatDialog::initMembers()
   defaultHeightSize = sheet ? sheet->rowFormat(0)->dblHeight() : 0;
 }
 
-bool CellFormatDialog::checkCircle( TQString const & name, TQString const & tqparent )
+bool CellFormatDialog::checkCircle( TQString const & name, TQString const & parent )
 {
-  return m_styleManager->checkCircle( name, tqparent );
+  return m_styleManager->checkCircle( name, parent );
 }
 
 void CellFormatDialog::checkBorderRight(Format *obj,int x,int y)
@@ -1078,8 +1078,8 @@ void CellFormatDialog::slotApply()
  *
  ***************************************************************************/
 
-CellFormatPageFloat::CellFormatPageFloat( TQWidget* tqparent, CellFormatDialog *_dlg )
-  : TQWidget ( tqparent ),
+CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_dlg )
+  : TQWidget ( parent ),
     dlg( _dlg )
 {
     TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6,10 );
@@ -1881,8 +1881,8 @@ void CellFormatPageFloat::apply(FormatManipulator* _obj)
  *
  ***************************************************************************/
 
-CellFormatPageProtection::CellFormatPageProtection( TQWidget* tqparent, CellFormatDialog * _dlg )
-  : ProtectionTab( tqparent ),
+CellFormatPageProtection::CellFormatPageProtection( TQWidget* parent, CellFormatDialog * _dlg )
+  : ProtectionTab( parent ),
     m_dlg( _dlg )
 {
   m_bDontPrint->setChecked( m_dlg->bDontPrintText );
@@ -1953,7 +1953,7 @@ void CellFormatPageProtection::apply(FormatManipulator* _obj)
  *
  ***************************************************************************/
 
-CellFormatPageFont::CellFormatPageFont( TQWidget* tqparent, CellFormatDialog *_dlg ) : FontTab( tqparent )
+CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg ) : FontTab( parent )
 {
   dlg = _dlg;
 
@@ -2228,8 +2228,8 @@ void CellFormatPageFont::setCombos()
  *
  ***************************************************************************/
 
-CellFormatPagePosition::CellFormatPagePosition( TQWidget* tqparent, CellFormatDialog *_dlg )
-  : PositionTab(tqparent ),
+CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDialog *_dlg )
+  : PositionTab(parent ),
     dlg( _dlg )
 {
     if ( dlg->alignX == Format::Left )
@@ -2529,7 +2529,7 @@ double CellFormatPagePosition::getSizeWidth() const
  *
  ***************************************************************************/
 
-BorderButton::BorderButton( TQWidget *tqparent, const char *_name ) : TQPushButton(tqparent,_name)
+BorderButton::BorderButton( TQWidget *parent, const char *_name ) : TQPushButton(parent,_name)
 {
   penStyle = Qt::NoPen;
   penWidth = 1;
@@ -2570,8 +2570,8 @@ void BorderButton::unselect()
  *
  ***************************************************************************/
 
-Border::Border( TQWidget *tqparent, const char *_name,bool _oneCol, bool _oneRow )
-    : TQFrame( tqparent, _name )
+Border::Border( TQWidget *parent, const char *_name,bool _oneCol, bool _oneRow )
+    : TQFrame( parent, _name )
 {
   oneCol=_oneCol;
   oneRow=_oneRow;
@@ -2630,8 +2630,8 @@ void Border::mousePressEvent( TQMouseEvent* _ev )
  *
  ***************************************************************************/
 
-CellFormatPageBorder::CellFormatPageBorder( TQWidget* tqparent, CellFormatDialog *_dlg )
-  : TQWidget( tqparent ),
+CellFormatPageBorder::CellFormatPageBorder( TQWidget* parent, CellFormatDialog *_dlg )
+  : TQWidget( parent ),
     dlg( _dlg )
 {
   sheet = dlg->getSheet();
@@ -3494,7 +3494,7 @@ if (rect.contains(TQPoint(_ev->x(),_ev->y())))
  *
  ***************************************************************************/
 
-BrushSelect::BrushSelect( TQWidget *tqparent, const char * ) : TQFrame( tqparent )
+BrushSelect::BrushSelect( TQWidget *parent, const char * ) : TQFrame( parent )
 {
     brushStyle = Qt::NoBrush;
     brushColor = TQt::red;
@@ -3555,7 +3555,7 @@ void BrushSelect::slotSelect()
  *
  ***************************************************************************/
 
-CellFormatPagePattern::CellFormatPagePattern( TQWidget* tqparent, CellFormatDialog *_dlg ) : TQWidget( tqparent )
+CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog *_dlg ) : TQWidget( parent )
 {
     dlg = _dlg;
 
diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h
index ddb364e7d..b8ec0bba8 100644
--- a/kspread/dialogs/kspread_dlg_layout.h
+++ b/kspread/dialogs/kspread_dlg_layout.h
@@ -99,7 +99,7 @@ class PatternSelect : public TQFrame
     Q_OBJECT
   TQ_OBJECT
 public:
-    PatternSelect( TQWidget *tqparent, const char *_name );
+    PatternSelect( TQWidget *parent, const char *_name );
 
     void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; tqrepaint(); }
     Qt::PenStyle getPenStyle() { return penStyle; }
@@ -139,7 +139,7 @@ class GeneralTab : public TQWidget
   TQ_OBJECT
 
  public:
-  GeneralTab( TQWidget * tqparent, CellFormatDialog * _dlg );
+  GeneralTab( TQWidget * parent, CellFormatDialog * _dlg );
   ~GeneralTab();
 
   bool apply( CustomStyle * style );
@@ -167,7 +167,7 @@ class CellFormatPageFont : public FontTab
     Q_OBJECT
   TQ_OBJECT
 public:
-    CellFormatPageFont( TQWidget* tqparent, CellFormatDialog *_dlg );
+    CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg );
 
     void apply( CustomStyle * style );
     void apply( FormatManipulator *_obj );
@@ -210,7 +210,7 @@ class CellFormatPageFloat : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    CellFormatPageFloat( TQWidget *tqparent, CellFormatDialog *_dlg );
+    CellFormatPageFloat( TQWidget *parent, CellFormatDialog *_dlg );
     void apply( CustomStyle * style );
     void apply( FormatManipulator *_obj );
 
@@ -254,7 +254,7 @@ class CellFormatPagePosition : public PositionTab
     Q_OBJECT
   TQ_OBJECT
 public:
-    CellFormatPagePosition( TQWidget *tqparent, CellFormatDialog *_dlg );
+    CellFormatPagePosition( TQWidget *parent, CellFormatDialog *_dlg );
 
     void apply( CustomStyle * style );
     void apply( FormatManipulator *_obj );
@@ -286,7 +286,7 @@ class Border : public TQFrame
     Q_OBJECT
   TQ_OBJECT
 public:
-    Border( TQWidget *tqparent,const char *_name,bool _oneCol,bool _oneRow  );
+    Border( TQWidget *parent,const char *_name,bool _oneCol,bool _oneRow  );
 signals:
     void redraw();
     void choosearea(TQMouseEvent * _ev);
@@ -302,7 +302,7 @@ class BorderButton : public TQPushButton
     Q_OBJECT
   TQ_OBJECT
 public:
-    BorderButton( TQWidget *tqparent, const char *_name );
+    BorderButton( TQWidget *parent, const char *_name );
     void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat;}
     Qt::PenStyle getPenStyle() { return penStyle; }
     void setColor( const TQColor &_col ) { penColor = _col; }
@@ -329,7 +329,7 @@ class CellFormatPageBorder : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-    CellFormatPageBorder( TQWidget *tqparent, CellFormatDialog *_dlg );
+    CellFormatPageBorder( TQWidget *parent, CellFormatDialog *_dlg );
 
     void apply(FormatManipulator* obj);
     void invertState(BorderButton *_button);
@@ -387,7 +387,7 @@ class BrushSelect : public TQFrame
     Q_OBJECT
   TQ_OBJECT
 public:
-    BrushSelect( TQWidget *tqparent, const char *_name );
+    BrushSelect( TQWidget *parent, const char *_name );
 
     void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; tqrepaint(); }
     Qt::BrushStyle getBrushStyle() const { return brushStyle; }
@@ -417,7 +417,7 @@ class CellFormatPagePattern : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    CellFormatPagePattern( TQWidget *tqparent, CellFormatDialog *_dlg );
+    CellFormatPagePattern( TQWidget *parent, CellFormatDialog *_dlg );
 
     void apply( CustomStyle * style );
     void apply( FormatManipulator *_obj );
@@ -463,7 +463,7 @@ class CellFormatPageProtection : public ProtectionTab
   TQ_OBJECT
 
  public:
-  CellFormatPageProtection( TQWidget * tqparent, CellFormatDialog * _dlg );
+  CellFormatPageProtection( TQWidget * parent, CellFormatDialog * _dlg );
   ~CellFormatPageProtection();
   ///when protection is set through Style Manager
   void apply( CustomStyle * style );
@@ -516,7 +516,7 @@ public:
     StyleManager * getStyleManager() const { return m_styleManager; }
 
     bool isSingleCell() { return ( left == right && top == bottom ); }
-    bool checkCircle( TQString const & name, TQString const & tqparent );
+    bool checkCircle( TQString const & name, TQString const & parent );
 
     KLocale * locale() const { return m_pView->doc()->locale(); }
 
diff --git a/kspread/dialogs/kspread_dlg_list.cc b/kspread/dialogs/kspread_dlg_list.cc
index 83eb54c9c..f4e032694 100644
--- a/kspread/dialogs/kspread_dlg_list.cc
+++ b/kspread/dialogs/kspread_dlg_list.cc
@@ -39,8 +39,8 @@
 
 using namespace KSpread;
 
-ListDialog::ListDialog( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n("Custom Lists"), Ok|Cancel )
+ListDialog::ListDialog( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n("Custom Lists"), Ok|Cancel )
 {
   TQWidget* page = new TQWidget( this );
   setMainWidget( page );
diff --git a/kspread/dialogs/kspread_dlg_list.h b/kspread/dialogs/kspread_dlg_list.h
index 714186bbb..7b869d518 100644
--- a/kspread/dialogs/kspread_dlg_list.h
+++ b/kspread/dialogs/kspread_dlg_list.h
@@ -41,7 +41,7 @@ class ListDialog: public KDialogBase
   TQ_OBJECT
 
 public:
-  ListDialog( TQWidget* tqparent, const char* name );
+  ListDialog( TQWidget* parent, const char* name );
   void init();
 
 public slots:
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index c6b52c159..f0e6f6648 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -47,12 +47,12 @@
 
 using namespace KSpread;
 
-PaperLayout::PaperLayout( TQWidget * tqparent, const char * name,
+PaperLayout::PaperLayout( TQWidget * parent, const char * name,
                                         const KoPageLayout & tqlayout,
                                         const KoHeadFoot & headfoot,
                                         int tabs, KoUnit::Unit unit,
                                         Sheet * sheet, View * view)
-  : KoPageLayoutDia( tqparent, name, tqlayout, headfoot, tabs, unit, false /*no modal*/),
+  : KoPageLayoutDia( parent, name, tqlayout, headfoot, tabs, unit, false /*no modal*/),
     m_pSheet( sheet ),
     m_pView( view )
 {
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h
index cd3537a34..c9a9e6e5b 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.h
+++ b/kspread/dialogs/kspread_dlg_paperlayout.h
@@ -41,7 +41,7 @@ class PaperLayout: public KoPageLayoutDia
   Q_OBJECT
   TQ_OBJECT
 public:
-  PaperLayout( TQWidget* tqparent, const char* name,
+  PaperLayout( TQWidget* parent, const char* name,
                       const KoPageLayout& tqlayout,
                       const KoHeadFoot& headfoot,
                       int tabs, KoUnit::Unit unit,
diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc
index 83e8bce38..9b54644d3 100644
--- a/kspread/dialogs/kspread_dlg_pasteinsert.cc
+++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc
@@ -37,10 +37,10 @@
 
 using namespace KSpread;
 
-PasteInsertDialog::PasteInsertDialog( View* tqparent, const char* name,const TQRect &_rect)
-	: KDialogBase( tqparent, name, TRUE,i18n("Paste Inserting Cells"),Ok|Cancel )
+PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRect &_rect)
+	: KDialogBase( parent, name, TRUE,i18n("Paste Inserting Cells"),Ok|Cancel )
 {
-  m_pView = tqparent;
+  m_pView = parent;
   rect=_rect;
 
   TQWidget *page = new TQWidget( this );
diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.h b/kspread/dialogs/kspread_dlg_pasteinsert.h
index 7159b87ed..201ca280d 100644
--- a/kspread/dialogs/kspread_dlg_pasteinsert.h
+++ b/kspread/dialogs/kspread_dlg_pasteinsert.h
@@ -38,7 +38,7 @@ class PasteInsertDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    PasteInsertDialog( View* tqparent, const char* name, const TQRect &_rect );
+    PasteInsertDialog( View* parent, const char* name, const TQRect &_rect );
 
 public slots:
     void slotOk();
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index 2b13cbdfc..3d470ecff 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -55,39 +55,39 @@
 
 using namespace KSpread;
 
-PreferenceDialog::PreferenceDialog( View* tqparent, const char* /*name*/)
+PreferenceDialog::PreferenceDialog( View* parent, const char* /*name*/)
   : KDialogBase(KDialogBase::IconList,i18n("Configure KSpread") ,
 		KDialogBase::Ok | KDialogBase::Cancel| KDialogBase::Default,
 		KDialogBase::Ok)
 
 {
-  m_pView=tqparent;
+  m_pView=parent;
 
   connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply()));
 
   TQVBox *page2=addVBoxPage(i18n("Locale Settings"), TQString(),BarIcon("gohome",KIcon::SizeMedium));
- _localePage=new parameterLocale(tqparent,page2 );
+ _localePage=new parameterLocale(parent,page2 );
 
   TQVBox *page3=addVBoxPage(i18n("Interface"), TQString(),BarIcon("signature", KIcon::SizeMedium) );
-  _configure = new  configure(tqparent,page3 );
+  _configure = new  configure(parent,page3 );
 
   TQVBox * page4=addVBoxPage(i18n("Misc"), TQString(),BarIcon("misc",KIcon::SizeMedium) );
-  _miscParameter = new  miscParameters(tqparent,page4 );
+  _miscParameter = new  miscParameters(parent,page4 );
 
   TQVBox *page5=addVBoxPage(i18n("Color"), TQString(),BarIcon("colorize",KIcon::SizeMedium) );
-  _colorParameter=new colorParameters(tqparent,page5 );
+  _colorParameter=new colorParameters(parent,page5 );
 
   TQVBox *page6=addVBoxPage(i18n("Page Layout"), TQString(),BarIcon("edit",KIcon::SizeMedium) );
-  _layoutPage=new configureLayoutPage(tqparent,page6 );
+  _layoutPage=new configureLayoutPage(parent,page6 );
 
   TQVBox *page7 = addVBoxPage( i18n("Spelling"), i18n("Spell Checker Behavior"),
                           BarIcon("spellcheck", KIcon::SizeMedium) );
-  _spellPage=new configureSpellPage(tqparent,page7);
+  _spellPage=new configureSpellPage(parent,page7);
 
   if (KoSpeaker::isKttsdInstalled()) {
       TQVBox *page8 = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"),
           i18n("Text-to-Speech Settings"), BarIcon("access", KIcon::SizeMedium) );
-      _ttsPage=new configureTTSPage(tqparent, page8);
+      _ttsPage=new configureTTSPage(parent, page8);
   } else _ttsPage = 0;
 
 }
@@ -151,7 +151,7 @@ void PreferenceDialog::slotDefault()
 
 
 parameterLocale::parameterLocale( View* _view, TQVBox *box , char *name )
- :TQObject ( box->tqparent(),name)
+ :TQObject ( box->parent(),name)
 {
     m_pView = _view;
     m_bUpdateLocale=false;
@@ -201,7 +201,7 @@ void parameterLocale::updateToMatchLocale(KLocale* locale)
 }
 
 configure::configure( View* _view, TQVBox *box , char *name )
- :TQObject ( box->tqparent(),name)
+ :TQObject ( box->parent(),name)
  {
   m_pView = _view;
 
@@ -406,7 +406,7 @@ void configure::apply()
 
 
 miscParameters::miscParameters( View* _view,TQVBox *box, char *name )
- :TQObject ( box->tqparent(),name)
+ :TQObject ( box->parent(),name)
  {
   m_pView = _view;
 
@@ -717,7 +717,7 @@ void miscParameters::apply()
 
 
 colorParameters::colorParameters( View* _view,TQVBox *box , char *name )
- :TQObject ( box->tqparent(),name)
+ :TQObject ( box->parent(),name)
 {
   m_pView = _view;
   config = Factory::global()->config();
@@ -785,7 +785,7 @@ void colorParameters::slotDefault()
 
 
 configureLayoutPage::configureLayoutPage( View* _view,TQVBox *box , char *name )
- :TQObject ( box->tqparent(),name)
+ :TQObject ( box->parent(),name)
 {
   m_pView = _view;
 
@@ -891,7 +891,7 @@ void configureLayoutPage::apply()
 }
 
 configureSpellPage::configureSpellPage( View* _view,TQVBox *box , char *name )
- :TQObject ( box->tqparent(),name)
+ :TQObject ( box->parent(),name)
 {
   m_pView = _view;
 
@@ -956,7 +956,7 @@ void configureSpellPage::slotDefault()
 ////
 
 configureTTSPage::configureTTSPage( View *_view, TQVBox *box, char *name )
- : TQObject( box->tqparent(), name )
+ : TQObject( box->parent(), name )
 {
     Q_UNUSED(_view);
 
diff --git a/kspread/dialogs/kspread_dlg_preference.h b/kspread/dialogs/kspread_dlg_preference.h
index ec4abf11d..29a995afb 100644
--- a/kspread/dialogs/kspread_dlg_preference.h
+++ b/kspread/dialogs/kspread_dlg_preference.h
@@ -210,7 +210,7 @@ class PreferenceDialog : public KDialogBase
 public:
   enum { KS_PREFERENCES = 1, KS_LOCALE = 2, KS_INTERFACE = 4,
          KS_MISC = 8, KS_COLOR = 16, KS_LAYOUT = 32, KS_SPELLING = 64 };
-  PreferenceDialog( View* tqparent, const char* name);
+  PreferenceDialog( View* parent, const char* name);
 public slots:
   void slotApply();
   void slotDefault();
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc
index 8f315ca5a..386be712c 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -51,10 +51,10 @@
 
 using namespace KSpread;
 
-reference::reference( View* tqparent, const char* name )
-  : TQDialog( tqparent, name,TRUE )
+reference::reference( View* parent, const char* name )
+  : TQDialog( parent, name,TRUE )
 {
-  m_pView = tqparent;
+  m_pView = parent;
   TQVBoxLayout *lay1 = new TQVBoxLayout( this );
   lay1->setMargin( KDialog::marginHint() );
   lay1->setSpacing( KDialog::spacingHint() );
@@ -246,12 +246,12 @@ void reference::slotCancel()
 
 
 
-EditAreaName::EditAreaName( View * tqparent,
+EditAreaName::EditAreaName( View * parent,
                                           const char * name,
                                           TQString const & areaname )
-    : KDialogBase( tqparent, name ,true,i18n( "Edit Area" ) , Ok|Cancel )
+    : KDialogBase( parent, name ,true,i18n( "Edit Area" ) , Ok|Cancel )
 {
-  m_pView = tqparent;
+  m_pView = parent;
 
   resize( 350, 142 );
   tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
diff --git a/kspread/dialogs/kspread_dlg_reference.h b/kspread/dialogs/kspread_dlg_reference.h
index 30932101d..0941e025c 100644
--- a/kspread/dialogs/kspread_dlg_reference.h
+++ b/kspread/dialogs/kspread_dlg_reference.h
@@ -44,7 +44,7 @@ class reference: public TQDialog
   Q_OBJECT
   TQ_OBJECT
 public:
-  reference( View* tqparent, const char* name );
+  reference( View* parent, const char* name );
 
 
 public slots:
@@ -74,7 +74,7 @@ class EditAreaName : public KDialogBase
   TQ_OBJECT
 
 public:
-    EditAreaName( View * tqparent, const char * name,
+    EditAreaName( View * parent, const char * name,
                          TQString const & areaname );
     ~EditAreaName();
 
diff --git a/kspread/dialogs/kspread_dlg_resize2.cc b/kspread/dialogs/kspread_dlg_resize2.cc
index d287ee4fa..e6d74d26d 100644
--- a/kspread/dialogs/kspread_dlg_resize2.cc
+++ b/kspread/dialogs/kspread_dlg_resize2.cc
@@ -47,10 +47,10 @@
 
 using namespace KSpread;
 
-ResizeRow::ResizeRow( View* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n("Resize Row"), Ok|Cancel|Default )
+ResizeRow::ResizeRow( View* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n("Resize Row"), Ok|Cancel|Default )
 {
-    m_pView = tqparent;
+    m_pView = parent;
 
     TQWidget *page = new TQWidget( this );
     setMainWidget( page );
@@ -113,10 +113,10 @@ void ResizeRow::slotDefault()
   m_pHeight->setValue(KoUnit::toUserValue(points, m_pView->doc()->unit()));
 }
 
-ResizeColumn::ResizeColumn( View* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n("Resize Column"), Ok|Cancel|Default )
+ResizeColumn::ResizeColumn( View* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n("Resize Column"), Ok|Cancel|Default )
 {
-    m_pView = tqparent;
+    m_pView = parent;
 
     TQWidget *page = new TQWidget( this );
     setMainWidget(page);
diff --git a/kspread/dialogs/kspread_dlg_resize2.h b/kspread/dialogs/kspread_dlg_resize2.h
index 3e955f18b..61b5c0a5a 100644
--- a/kspread/dialogs/kspread_dlg_resize2.h
+++ b/kspread/dialogs/kspread_dlg_resize2.h
@@ -41,7 +41,7 @@ class ResizeRow: public KDialogBase
   TQ_OBJECT
 
 public:
-  ResizeRow( View* tqparent, const char* name = 0 );
+  ResizeRow( View* parent, const char* name = 0 );
   double rowHeight;
 
 protected slots:
@@ -59,7 +59,7 @@ class ResizeColumn: public KDialogBase
   TQ_OBJECT
 
 public:
-  ResizeColumn( View* tqparent, const char* name = 0 );
+  ResizeColumn( View* parent, const char* name = 0 );
   double columnWidth;
 
 protected slots:
diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc
index 725859d33..0158dd2a5 100644
--- a/kspread/dialogs/kspread_dlg_series.cc
+++ b/kspread/dialogs/kspread_dlg_series.cc
@@ -47,10 +47,10 @@
 
 using namespace KSpread;
 
-SeriesDlg::SeriesDlg( View* tqparent, const char* name,const TQPoint &_marker)
-  : KDialogBase( tqparent, name,TRUE,i18n("Series"),Ok|Cancel )
+SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker)
+  : KDialogBase( parent, name,TRUE,i18n("Series"),Ok|Cancel )
 {
-  m_pView = tqparent;
+  m_pView = parent;
   marker=_marker;
   TQWidget *page = new TQWidget( this );
   setMainWidget(page);
diff --git a/kspread/dialogs/kspread_dlg_series.h b/kspread/dialogs/kspread_dlg_series.h
index fd7cc5486..60419ab3a 100644
--- a/kspread/dialogs/kspread_dlg_series.h
+++ b/kspread/dialogs/kspread_dlg_series.h
@@ -43,7 +43,7 @@ class SeriesDlg : public KDialogBase
   TQ_OBJECT
 public:
 
-    SeriesDlg(View* tqparent, const char* name,const TQPoint &_marker);
+    SeriesDlg(View* parent, const char* name,const TQPoint &_marker);
 
     Sheet* sheet;
 
diff --git a/kspread/dialogs/kspread_dlg_show.cc b/kspread/dialogs/kspread_dlg_show.cc
index 0719eb07e..c73f71ec8 100644
--- a/kspread/dialogs/kspread_dlg_show.cc
+++ b/kspread/dialogs/kspread_dlg_show.cc
@@ -38,10 +38,10 @@
 
 using namespace KSpread;
 
-ShowDialog::ShowDialog( View* tqparent, const char* name )
-	: KDialogBase( tqparent, name,TRUE,i18n("Show Sheet"),Ok|Cancel )
+ShowDialog::ShowDialog( View* parent, const char* name )
+	: KDialogBase( parent, name,TRUE,i18n("Show Sheet"),Ok|Cancel )
 {
-  m_pView = tqparent;
+  m_pView = parent;
   TQWidget *page = new TQWidget( this );
   setMainWidget(page);
   TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() );
diff --git a/kspread/dialogs/kspread_dlg_show.h b/kspread/dialogs/kspread_dlg_show.h
index 239e18b64..2a17a454d 100644
--- a/kspread/dialogs/kspread_dlg_show.h
+++ b/kspread/dialogs/kspread_dlg_show.h
@@ -38,7 +38,7 @@ class ShowDialog: public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  ShowDialog( View* tqparent, const char* name );
+  ShowDialog( View* parent, const char* name );
 
 
 public slots:
diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc
index 0a8ea14d9..75a50cc3d 100644
--- a/kspread/dialogs/kspread_dlg_showColRow.cc
+++ b/kspread/dialogs/kspread_dlg_showColRow.cc
@@ -35,10 +35,10 @@
 
 using namespace KSpread;
 
-ShowColRow::ShowColRow( View* tqparent, const char* name, Type _type )
-	: KDialogBase( tqparent, name,TRUE,"",Ok|Cancel )
+ShowColRow::ShowColRow( View* parent, const char* name, Type _type )
+	: KDialogBase( parent, name,TRUE,"",Ok|Cancel )
 {
-  m_pView = tqparent;
+  m_pView = parent;
   typeShow=_type;
 
   TQWidget *page = new TQWidget( this );
diff --git a/kspread/dialogs/kspread_dlg_showColRow.h b/kspread/dialogs/kspread_dlg_showColRow.h
index c0bdc5916..d6f23ee4b 100644
--- a/kspread/dialogs/kspread_dlg_showColRow.h
+++ b/kspread/dialogs/kspread_dlg_showColRow.h
@@ -39,7 +39,7 @@ class ShowColRow: public KDialogBase
   TQ_OBJECT
 public:
   enum Type { Column, Row };
-  ShowColRow( View* tqparent, const char* name, Type _type );
+  ShowColRow( View* parent, const char* name, Type _type );
 
 public slots:
   void slotOk();
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 17beca416..1e58ccf5d 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -56,10 +56,10 @@
 
 using namespace KSpread;
 
-SortDialog::SortDialog( View * tqparent,  const char * name,
+SortDialog::SortDialog( View * parent,  const char * name,
                                 bool modal )
-    : KDialogBase( tqparent, name, modal,"Sort",Ok|Cancel ),
-    m_pView( tqparent )
+    : KDialogBase( parent, name, modal,"Sort",Ok|Cancel ),
+    m_pView( parent )
 {
   if ( !name )
     setName( "SortDialog" );
diff --git a/kspread/dialogs/kspread_dlg_sort.h b/kspread/dialogs/kspread_dlg_sort.h
index 2abe5bda0..76da4fda0 100644
--- a/kspread/dialogs/kspread_dlg_sort.h
+++ b/kspread/dialogs/kspread_dlg_sort.h
@@ -58,7 +58,7 @@ class SortDialog : public KDialogBase
     SortRows=1
   };
   
-  SortDialog( View * tqparent, const char * name = 0,
+  SortDialog( View * parent, const char * name = 0,
                   bool modal = false );
   ~SortDialog();
  
diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc
index 192fea6d8..3f0c27e02 100644
--- a/kspread/dialogs/kspread_dlg_special.cc
+++ b/kspread/dialogs/kspread_dlg_special.cc
@@ -36,10 +36,10 @@
 
 using namespace KSpread;
 
-SpecialDialog::SpecialDialog( View* tqparent, const char* name )
-	: KDialogBase( tqparent, name, TRUE,i18n("Special Paste"),Ok|Cancel  )
+SpecialDialog::SpecialDialog( View* parent, const char* name )
+	: KDialogBase( parent, name, TRUE,i18n("Special Paste"),Ok|Cancel  )
 {
-    m_pView = tqparent;
+    m_pView = parent;
     TQWidget *page = new TQWidget( this );
     setMainWidget(page);
     TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() );
diff --git a/kspread/dialogs/kspread_dlg_special.h b/kspread/dialogs/kspread_dlg_special.h
index 1e9f0eabf..0f9b853b0 100644
--- a/kspread/dialogs/kspread_dlg_special.h
+++ b/kspread/dialogs/kspread_dlg_special.h
@@ -38,7 +38,7 @@ class SpecialDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    SpecialDialog( View* tqparent, const char* name );
+    SpecialDialog( View* parent, const char* name );
 
 public slots:
     void slotOk();
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index 6a8e0faeb..32a5474a6 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -39,8 +39,8 @@
 
 using namespace KSpread;
 
-StyleWidget::StyleWidget( TQWidget * tqparent, const char * name, WFlags fl )
-  : TQWidget( tqparent, name, fl )
+StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl )
+  : TQWidget( parent, name, fl )
 {
   TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout");
 
@@ -68,12 +68,12 @@ StyleWidget::~StyleWidget()
 
 
 
-StyleDlg::StyleDlg( View * tqparent, StyleManager * manager,
+StyleDlg::StyleDlg( View * parent, StyleManager * manager,
                                   const char * name )
-  : KDialogBase( tqparent, name, true, "",
+  : KDialogBase( parent, name, true, "",
                  KDialogBase::Ok | KDialogBase::User1 | KDialogBase::User2 | KDialogBase::User3 | KDialogBase::Close,
                  KDialogBase::Ok, false, KGuiItem( i18n( "&New..." ) ), KGuiItem( i18n( "&Modify..." ) ), KGuiItem( i18n( "&Delete" ) ) ),
-    m_view( tqparent ),
+    m_view( parent ),
     m_styleManager( manager ),
     m_dlg( new StyleWidget( this ) )
 {
@@ -113,11 +113,11 @@ void StyleDlg::fillComboBox()
   {
     if ( entries.find( iter.data() ) == entries.end() )
     {
-      if ( iter.data()->tqparent() == 0 )
+      if ( iter.data()->parent() == 0 )
         entries[iter.data()] = new KListViewItem( m_dlg->m_styleList, iter.data()->name() );
       else
       {
-        Map::const_iterator i = entries.find( iter.data()->tqparent() );
+        Map::const_iterator i = entries.find( iter.data()->parent() );
         if ( i != entries.end() )
           entries[iter.data()] = new KListViewItem( i.data(), iter.data()->name() );
       }
diff --git a/kspread/dialogs/kspread_dlg_styles.h b/kspread/dialogs/kspread_dlg_styles.h
index 5a87dcffa..d832fad40 100644
--- a/kspread/dialogs/kspread_dlg_styles.h
+++ b/kspread/dialogs/kspread_dlg_styles.h
@@ -40,7 +40,7 @@ class StyleWidget : public TQWidget
   TQ_OBJECT
 
  public:
-  StyleWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  StyleWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~StyleWidget();
 
   KListView * m_styleList;
@@ -54,7 +54,7 @@ class StyleDlg : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
  public:
-  StyleDlg( View * tqparent, StyleManager * manager,
+  StyleDlg( View * parent, StyleManager * manager,
                    const char * name = "StyleDlg" );
   ~StyleDlg();
 
diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc
index a27716423..1b899ebf5 100644
--- a/kspread/dialogs/kspread_dlg_subtotal.cc
+++ b/kspread/dialogs/kspread_dlg_subtotal.cc
@@ -38,9 +38,9 @@
 
 using namespace KSpread;
 
-SubtotalDialog::SubtotalDialog( View * tqparent, TQRect const & selection, const char * name )
-  : KDialogBase(tqparent, name, true, i18n( "Subtotals" ), Ok | Cancel | User1, Ok, true, KGuiItem(i18n( "Remove All" )) ),
-    m_pView( tqparent ),
+SubtotalDialog::SubtotalDialog( View * parent, TQRect const & selection, const char * name )
+  : KDialogBase(parent, name, true, i18n( "Subtotals" ), Ok | Cancel | User1, Ok, true, KGuiItem(i18n( "Remove All" )) ),
+    m_pView( parent ),
     m_pSheet( m_pView->activeSheet() ),
     m_selection( selection ),
     m_dialog( new Subtotal( this ) )
diff --git a/kspread/dialogs/kspread_dlg_subtotal.h b/kspread/dialogs/kspread_dlg_subtotal.h
index 230560a5a..96c95f70f 100644
--- a/kspread/dialogs/kspread_dlg_subtotal.h
+++ b/kspread/dialogs/kspread_dlg_subtotal.h
@@ -42,7 +42,7 @@ class SubtotalDialog : public KDialogBase
   TQ_OBJECT
 
  public:
-  SubtotalDialog( View * tqparent, TQRect const & selection, 
+  SubtotalDialog( View * parent, TQRect const & selection, 
                       const char * name );
   ~SubtotalDialog();
 
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc
index 885d06f78..8f61c5d8b 100644
--- a/kspread/dialogs/kspread_dlg_validity.cc
+++ b/kspread/dialogs/kspread_dlg_validity.cc
@@ -43,11 +43,11 @@
 
 using namespace KSpread;
 
-DlgValidity::DlgValidity(View* tqparent,const char* name , const TQRect &_marker )
-  :KDialogBase(KDialogBase::Tabbed, i18n("Validity"),User2|User1|Cancel, User1, tqparent, name,true,false,KStdGuiItem::ok(),i18n("Clear &All"))
+DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
+  :KDialogBase(KDialogBase::Tabbed, i18n("Validity"),User2|User1|Cancel, User1, parent, name,true,false,KStdGuiItem::ok(),i18n("Clear &All"))
 
 {
-  m_pView=tqparent;
+  m_pView=parent;
   marker=_marker;
   TQFrame *page1 = addPage(i18n("&Values"));
   TQVBoxLayout *lay1 = new TQVBoxLayout( page1, KDialogBase::marginHint(), KDialogBase::spacingHint() );
diff --git a/kspread/dialogs/kspread_dlg_validity.h b/kspread/dialogs/kspread_dlg_validity.h
index b9546cac8..41c4cbeec 100644
--- a/kspread/dialogs/kspread_dlg_validity.h
+++ b/kspread/dialogs/kspread_dlg_validity.h
@@ -45,7 +45,7 @@ class DlgValidity : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-DlgValidity(View* tqparent, const char* name ,const TQRect &_marker );
+DlgValidity(View* parent, const char* name ,const TQRect &_marker );
 void init();
 
 public slots:
diff --git a/kspread/dialogs/link.h b/kspread/dialogs/link.h
index c34640fe4..963a02b43 100644
--- a/kspread/dialogs/link.h
+++ b/kspread/dialogs/link.h
@@ -36,7 +36,7 @@ class LinkDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    LinkDialog( TQWidget* tqparent, const char* name = 0 );
+    LinkDialog( TQWidget* parent, const char* name = 0 );
     ~LinkDialog();
     TQString text() const;
     TQString link() const;
diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc
index 2f3451032..69397687c 100644
--- a/kspread/dialogs/sheet_properties.cc
+++ b/kspread/dialogs/sheet_properties.cc
@@ -31,8 +31,8 @@
 
 using namespace KSpread;
 
-SheetPropertiesDialog::SheetPropertiesDialog( TQWidget* tqparent ):
-  KDialogBase( tqparent, "sheetPropertiesDialog", true, 
+SheetPropertiesDialog::SheetPropertiesDialog( TQWidget* parent ):
+  KDialogBase( parent, "sheetPropertiesDialog", true, 
   i18n("Sheet Properties"), 
   KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Default )
 {
diff --git a/kspread/dialogs/sheet_properties.h b/kspread/dialogs/sheet_properties.h
index 6ab51a403..766b5e543 100644
--- a/kspread/dialogs/sheet_properties.h
+++ b/kspread/dialogs/sheet_properties.h
@@ -35,7 +35,7 @@ class SheetPropertiesDialog : public KDialogBase
 
 public:
 
-    SheetPropertiesDialog( TQWidget* tqparent = 0 );
+    SheetPropertiesDialog( TQWidget* parent = 0 );
 
     ~SheetPropertiesDialog();
 
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index a6411621f..3f482e273 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -2769,7 +2769,7 @@ void Canvas::keyPressEvent ( TQKeyEvent * _ev )
   }
 
   // Always accept so that events are not
-  // passed to the tqparent.
+  // passed to the parent.
   _ev->accept();
 
   d->view->doc()->emitBeginOperation(false);
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index a0ae20730..fdcf38be6 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cc
@@ -5958,7 +5958,7 @@ bool Cell::loadOasis( const TQDomElement& element , KoOasisLoadingContext& oasis
     return true;
 }
 
-void Cell::loadOasisCellText( const TQDomElement& tqparent )
+void Cell::loadOasisCellText( const TQDomElement& parent )
 {
     //Search and load each paragraph of text. Each paragraph is separated by a line break
     TQDomElement textParagraphElement;
@@ -5966,7 +5966,7 @@ void Cell::loadOasisCellText( const TQDomElement& tqparent )
 
     bool multipleTextParagraphsFound=false;
 
-    forEachElement( textParagraphElement , tqparent )
+    forEachElement( textParagraphElement , parent )
     {
         if ( textParagraphElement.localName()=="p" &&
              textParagraphElement.namespaceURI()== KoXmlNS::text )
@@ -6010,9 +6010,9 @@ void Cell::loadOasisCellText( const TQDomElement& tqparent )
     }
 }
 
-void Cell::loadOasisObjects( const TQDomElement &tqparent, KoOasisLoadingContext& oasisContext )
+void Cell::loadOasisObjects( const TQDomElement &parent, KoOasisLoadingContext& oasisContext )
 {
-    for( TQDomElement e = tqparent; !e.isNull(); e = e.nextSibling().toElement() )
+    for( TQDomElement e = parent; !e.isNull(); e = e.nextSibling().toElement() )
     {
         if ( e.localName() == "frame" && e.namespaceURI() == KoXmlNS::draw )
         {
diff --git a/kspread/kspread_cell.h b/kspread/kspread_cell.h
index 5831d717c..500804f3d 100644
--- a/kspread/kspread_cell.h
+++ b/kspread/kspread_cell.h
@@ -270,7 +270,7 @@ public:
     void move( int column, int row );
 
     /**
-     * This method notifies the cell that the tqparent sheet is being deleted.
+     * This method notifies the cell that the parent sheet is being deleted.
      */
     // Note:  This used to remove any links from this cell to other cells.  However, this caused a problem
     // in other parts of the code which relied upon walking from one cell to the next using
@@ -990,9 +990,9 @@ protected:
 
    /**
      * Load the text paragraphs from an OASIS XML cell description.
-     * @param tqparent The DOM element representing the cell.
+     * @param parent The DOM element representing the cell.
      */
-    void loadOasisCellText( const TQDomElement& tqparent );
+    void loadOasisCellText( const TQDomElement& parent );
     void loadOasisObjects( const TQDomElement& e, KoOasisLoadingContext& oasisContext );
     void loadOasisValidation( const TQString& validationName );
 
@@ -1063,7 +1063,7 @@ private:
 
 
   /** handle the fact that a cell has been updated - calls cellUpdated()
-  in the tqparent Sheet object */
+  in the parent Sheet object */
   void valueChanged ();
 
   /* helper functions to the makeLayout(...) function */
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index 0491e630a..188dbe2ee 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -169,8 +169,8 @@ public:
 TQValueList<Doc*> Doc::Private::s_docs;
 int Doc::Private::s_docId = 0;
 
-Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-  : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
+Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode )
+  : KoDocument( parentWidget, widgetName, parent, name, singleViewMode )
 {
   d = new Private;
   d->m_loadingInfo = 0L;
@@ -505,11 +505,11 @@ KCompletion& Doc::completion()
   return d->listCompletion;
 }
 
-KoView* Doc::createViewInstance( TQWidget* tqparent, const char* name )
+KoView* Doc::createViewInstance( TQWidget* parent, const char* name )
 {
     if ( name == 0 )
         name = "View";
-    return new View( tqparent, name, this );
+    return new View( parent, name, this );
 }
 
 bool Doc::saveChildren( KoStore* _store )
@@ -2230,7 +2230,7 @@ void Doc::emitEndOperation()
    {
    	TQApplication::restoreOverrideCursor();
 
-     /* do this after the tqparent class emitEndOperation because that allows updates
+     /* do this after the parent class emitEndOperation because that allows updates
         on the view again
      */
      paintUpdates();
@@ -2254,7 +2254,7 @@ void Doc::emitEndOperation( const Region& /*region*/ )
 
   TQApplication::restoreOverrideCursor();
 
-    /* do this after the tqparent class emitEndOperation because that allows updates
+    /* do this after the parent class emitEndOperation because that allows updates
     on the view again
     */
   paintUpdates();
diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h
index f2b7fa02c..63320a96d 100644
--- a/kspread/kspread_doc.h
+++ b/kspread/kspread_doc.h
@@ -120,7 +120,7 @@ public:
   /**
    * Creates a new document.
    */
-  Doc( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0,
+  Doc( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0,
   const char* name = 0, bool singleViewMode = false );
 
   /**
@@ -686,7 +686,7 @@ protected slots:
   virtual void initEmpty();
 
 protected:
-  KoView* createViewInstance( TQWidget* tqparent, const char* name );
+  KoView* createViewInstance( TQWidget* parent, const char* name );
 
   void makeUsedPixmapList();
   void insertPixmapKey( KoPictureKey key );
diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc
index c99481894..ddf41d317 100644
--- a/kspread/kspread_editors.cc
+++ b/kspread/kspread_editors.cc
@@ -1195,7 +1195,7 @@ bool CellEditor::eventFilter( TQObject* o, TQEvent* e )
                 k->key() == Key_Return || k->key() == Key_Enter)
           {
               // Send directly to canvas
-              TQApplication::sendEvent( tqparent(), e );
+              TQApplication::sendEvent( parent(), e );
               return true;
           }
         }
@@ -1213,10 +1213,10 @@ bool CellEditor::eventFilter( TQObject* o, TQEvent* e )
         // editor leaves editing mode ... otherwise editing is annoying
         // left/right arrows still work with the F2-editor.
 
-        // Forward left & right arrows to tqparent, unless this editor has been set to capture arrow key events
+        // Forward left & right arrows to parent, unless this editor has been set to capture arrow key events
         // Changed to this behaviour for consistancy with OO Calc & MS Office.
         if ( ((k->key() == TQt::Key_Left) || (k->key() == TQt::Key_Right)) && (!d->captureAllKeyEvents)) {
-          TQApplication::sendEvent (tqparent(), e);
+          TQApplication::sendEvent (parent(), e);
           return true;
         }
     }
@@ -1398,7 +1398,7 @@ void LocationEditWidget::keyPressEvent( TQKeyEvent * _ev )
     if ( _ev->state() & ( TQt::AltButton | TQt::ControlButton ) )
     {
         TQLineEdit::keyPressEvent( _ev );
-        // Never allow that keys are passed on to the tqparent.
+        // Never allow that keys are passed on to the parent.
         _ev->accept();
 
         return;
@@ -1433,7 +1433,7 @@ void LocationEditWidget::keyPressEvent( TQKeyEvent * _ev )
         break;
     default:
         TQLineEdit::keyPressEvent( _ev );
-        // Never allow that keys are passed on to the tqparent.
+        // Never allow that keys are passed on to the parent.
         _ev->accept();
     }
 }
diff --git a/kspread/kspread_editors.h b/kspread/kspread_editors.h
index 636517171..a8d721dbc 100644
--- a/kspread/kspread_editors.h
+++ b/kspread/kspread_editors.h
@@ -174,7 +174,7 @@ public:
     * Creates a new CellEditor.
     * @param cell The spreadsheet cell to associate the cell text editor with
     * @param _parent The @ref Canvas object to associate this cell text editor with
-    * @param captureAllKeyEvents Controls whether or not the text editor swallows arrow key events or sends them to the tqparent canvas instead.  If this is set to true, pressing the arrow keys will navigate backwards and forwards through the text in the editor.  If it is false, the key events will be sent to the tqparent canvas which will change the cell being edited (depending on the direction of the arrow pressed).  Generally this should be set to true if the user double clicks on the cell to edit it, and false if the user initiates editing by typing whilst the cell is selected.
+    * @param captureAllKeyEvents Controls whether or not the text editor swallows arrow key events or sends them to the parent canvas instead.  If this is set to true, pressing the arrow keys will navigate backwards and forwards through the text in the editor.  If it is false, the key events will be sent to the parent canvas which will change the cell being edited (depending on the direction of the arrow pressed).  Generally this should be set to true if the user double clicks on the cell to edit it, and false if the user initiates editing by typing whilst the cell is selected.
     * @param _name This parameter is sent to the TQObject constructor
     */
     CellEditor( Cell* cell, Canvas* _parent = 0, bool captureAllKeyEvents = false, const char* _name = 0 );
@@ -222,7 +222,7 @@ protected:
     void resizeEvent( TQResizeEvent* );
     /**
      * Steals some key events from the TQLineEdit and sends
-     * it to the @ref Canvas ( its tqparent ) instead.
+     * it to the @ref Canvas ( its parent ) instead.
      */
     bool eventFilter( TQObject* o, TQEvent* e );
 
@@ -294,7 +294,7 @@ class EditWidget : public TQLineEdit
     Q_OBJECT
   TQ_OBJECT
 public:
-    EditWidget( TQWidget *tqparent, Canvas *canvas,
+    EditWidget( TQWidget *parent, Canvas *canvas,
                        TQButton *cancelButton, TQButton *okButton);
 
     virtual void setText( const TQString& t );
diff --git a/kspread/kspread_factory.cc b/kspread/kspread_factory.cc
index a1ef34840..8d37c7998 100644
--- a/kspread/kspread_factory.cc
+++ b/kspread/kspread_factory.cc
@@ -32,8 +32,8 @@ KInstance* Factory::s_global = 0;
 DCOPObject* Factory::s_dcopObject = 0;
 KAboutData* Factory::s_aboutData = 0;
 
-Factory::Factory( TQObject* tqparent, const char* name )
-    : KoFactory( tqparent, name )
+Factory::Factory( TQObject* parent, const char* name )
+    : KoFactory( parent, name )
 {
   //kdDebug(36001) << "Factory::Factory()" << endl;
   // Create our instance, so that it becomes KGlobal::instance if the
@@ -53,11 +53,11 @@ Factory::~Factory()
   s_dcopObject = 0L;
 }
 
-KParts::Part* Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & )
 {
   bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-  Doc *doc = new Doc( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
+  Doc *doc = new Doc( parentWidget, widgetName, parent, name, !bWantKoDocument );
 
   if ( !bWantKoDocument )
     doc->setReadWrite( false );
diff --git a/kspread/kspread_factory.h b/kspread/kspread_factory.h
index ddf460991..7f2ec9551 100644
--- a/kspread/kspread_factory.h
+++ b/kspread/kspread_factory.h
@@ -33,10 +33,10 @@ class Factory : public KoFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    Factory( TQObject* tqparent = 0, const char* name = 0 );
+    Factory( TQObject* parent = 0, const char* name = 0 );
     ~Factory();
 
-    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc
index 73c0bbff9..587bf5005 100644
--- a/kspread/kspread_format.cc
+++ b/kspread/kspread_format.cc
@@ -64,7 +64,7 @@ double Format::s_rowHeight   = 20.0;
 Format::Format( Sheet * _sheet, Style * _style )
   : m_pSheet( _sheet ),
     m_pStyle( _style ),
-    m_tqmask( 0 ),
+    m_mask( 0 ),
     m_bNoFallBack( 0 ),
     m_flagsMask( 0 ),
     m_strComment( 0 ),
@@ -116,7 +116,7 @@ void Format::copy( const Format & _l )
 
   setStyle( _l.m_pStyle );
 
-  m_tqmask        = _l.m_tqmask;
+  m_mask        = _l.m_mask;
   m_flagsMask   = _l.m_flagsMask;
   m_bNoFallBack = _l.m_bNoFallBack;
 
@@ -162,14 +162,14 @@ bool Format::testFlag( FormatFlags flag ) const
 
 void Format::clearProperties()
 {
-    m_tqmask = 0;
+    m_mask = 0;
     m_pStyle->clearFeature( (Style::FlagsSet) ~(uint)0 );
     formatChanged();
 }
 
 void Format::clearProperty( Properties p )
 {
-    m_tqmask &= ~(uint)p;
+    m_mask &= ~(uint)p;
     m_pStyle->clearFeature( (Style::FlagsSet) p );
     formatChanged();
 }
@@ -181,12 +181,12 @@ bool Format::hasProperty( Properties p, bool withoutParent ) const
     if ( m_pStyle->hasFeature( (Style::FlagsSet) p, withoutParent ) )
         return true;
 
-    return ( m_tqmask & (uint)p );
+    return ( m_mask & (uint)p );
 }
 
 void Format::setProperty( Properties p )
 {
-    m_tqmask |= (uint)p;
+    m_mask |= (uint)p;
 }
 
 void Format::clearNoFallBackProperties()
@@ -248,8 +248,8 @@ TQDomElement Format::saveFormat( TQDomDocument & doc, int _col, int _row, bool f
   }
   else
   {
-    if ( m_pStyle->tqparent() && m_pStyle->tqparent()->name().length() > 0 )
-      format.setAttribute( "tqparent", m_pStyle->tqparent()->name() );
+    if ( m_pStyle->parent() && m_pStyle->parent()->name().length() > 0 )
+      format.setAttribute( "parent", m_pStyle->parent()->name() );
   }
 
   if ( hasProperty( PAlign, true ) || hasNoFallBackProperties( PAlign ) || force )
@@ -369,8 +369,8 @@ TQDomElement Format::saveFormat( TQDomDocument& doc, bool force, bool copy ) con
   }
   else
   {
-    if ( m_pStyle->tqparent() && m_pStyle->parentName().length() > 0 )
-      format.setAttribute( "tqparent", m_pStyle->parentName() );
+    if ( m_pStyle->parent() && m_pStyle->parentName().length() > 0 )
+      format.setAttribute( "parent", m_pStyle->parentName() );
   }
 
   if ( hasProperty( PAlign, true ) || hasNoFallBackProperties( PAlign ) || force )
@@ -499,10 +499,10 @@ bool Format::loadFormat( const TQDomElement & f, Paste::Mode pm, bool paste )
         return false;
     }
     else
-    if ( f.hasAttribute( "tqparent" ) )
+    if ( f.hasAttribute( "parent" ) )
     {
-      CustomStyle* s = static_cast<CustomStyle*>( m_pSheet->doc()->styleManager()->style( f.attribute( "tqparent" ) ) );
-      //kdDebug() << "Loading Style, tqparent: " << s->name() << ": " << s << endl;
+      CustomStyle* s = static_cast<CustomStyle*>( m_pSheet->doc()->styleManager()->style( f.attribute( "parent" ) ) );
+      //kdDebug() << "Loading Style, parent: " << s->name() << ": " << s << endl;
 
       if ( s )
       {
@@ -835,10 +835,10 @@ bool Format::loadOasisStyleProperties( KoStyleStack & styleStack, const KoOasisS
             return false;
     }
     else
-        if ( f.hasAttribute( "tqparent" ) )
+        if ( f.hasAttribute( "parent" ) )
         {
-            CustomStyle * s = (CustomStyle *) m_pSheet->doc()->styleManager()->style( f.attribute( "tqparent" ) );
-            //kdDebug() << "Loading Style, tqparent: " << s->name() << ": " << s << endl;
+            CustomStyle * s = (CustomStyle *) m_pSheet->doc()->styleManager()->style( f.attribute( "parent" ) );
+            //kdDebug() << "Loading Style, parent: " << s->name() << ": " << s << endl;
 
             if ( s )
             {
@@ -850,9 +850,9 @@ bool Format::loadOasisStyleProperties( KoStyleStack & styleStack, const KoOasisS
             }
         }
 #endif
-    if ( styleStack.hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
+    if ( styleStack.hasAttributeNS( KoXmlNS::style, "parent-style-name" ) )
     {
-        Style * s = m_pSheet->doc()->styleManager()->style( styleStack.attributeNS( KoXmlNS::style, "tqparent-style-name" ) );
+        Style * s = m_pSheet->doc()->styleManager()->style( styleStack.attributeNS( KoXmlNS::style, "parent-style-name" ) );
 
         //kdDebug() << "Using style: " << f.attribute( "style-name" ) << ", s: " << s << endl;
         if ( s )
@@ -1465,12 +1465,12 @@ void Format::setBackGroundBrushColor( const TQColor & c )
 
 void Format::setTextFont( const TQFont & _f )
 {
-  if( m_pStyle->tqparent() && _f == m_pStyle->tqparent()->font())
+  if( m_pStyle->parent() && _f == m_pStyle->parent()->font())
   {
     clearProperty( PFont );
     setNoFallBackProperties( PFont );
   }
-  else if( !m_pStyle->tqparent() && _f == KoGlobal::defaultFont() )
+  else if( !m_pStyle->parent() && _f == KoGlobal::defaultFont() )
   {
     clearProperty( PFont );
     setNoFallBackProperties( PFont );
@@ -2480,11 +2480,11 @@ const Format* Format::fallbackFormat( int, int row ) const
 bool Format::isDefault() const
 {
   // NOTE Stefan: Don't compare sheet and cell.
-  //              Because of the comment we have to check m_tqmask.
-  if ( ( m_tqmask & PComment ) && m_strComment != 0 )
+  //              Because of the comment we have to check m_mask.
+  if ( ( m_mask & PComment ) && m_strComment != 0 )
     return false;
 #if 0 // These are copied in Style.
-  if ( m_tqmask ) // Properties
+  if ( m_mask ) // Properties
     return false;
   if ( m_flagsMask != 0 ) // FormatFlags
     return false;
@@ -2497,11 +2497,11 @@ bool Format::isDefault() const
 bool Format::operator==( const Format& other ) const
 {
   // NOTE Stefan: Don't compare sheet and cell.
-  //              Because of the comment we have to check m_tqmask.
-  if ( ( m_tqmask & other.m_tqmask & PComment ) && m_strComment != other.m_strComment )
+  //              Because of the comment we have to check m_mask.
+  if ( ( m_mask & other.m_mask & PComment ) && m_strComment != other.m_strComment )
     return false;
 #if 0 // These are copied in Style.
-  if ( m_tqmask != other.m_tqmask ) // Properties
+  if ( m_mask != other.m_mask ) // Properties
     return false;
   if ( m_flagsMask != other.m_flagsMask ) // FormatFlags
     return false;
diff --git a/kspread/kspread_format.h b/kspread/kspread_format.h
index 8c3e9bc37..ed89807a2 100644
--- a/kspread/kspread_format.h
+++ b/kspread/kspread_format.h
@@ -142,7 +142,7 @@ public:
     // Properties
     //
     ////////////////////////////////
-    uint propertiesMask() { return m_tqmask; } // For the cell inspector only.
+    uint propertiesMask() { return m_mask; } // For the cell inspector only.
     void clearProperties();
     void clearProperty( Properties p );
 
@@ -422,7 +422,7 @@ protected:
     Sheet * m_pSheet;
     Style * m_pStyle;
 
-    uint m_tqmask;
+    uint m_mask;
 
     /**
     * used  m_bNoFallBack when you put default value in a cell and
diff --git a/kspread/kspread_generalProperty.cpp b/kspread/kspread_generalProperty.cpp
index 2e470e320..d2518494c 100644
--- a/kspread/kspread_generalProperty.cpp
+++ b/kspread/kspread_generalProperty.cpp
@@ -32,8 +32,8 @@
 
 using namespace KSpread;
 
-GeneralProperty::GeneralProperty( TQWidget *tqparent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit )
-: TQWidget( tqparent, name )
+GeneralProperty::GeneralProperty( TQWidget *parent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit )
+: TQWidget( parent, name )
 , m_ratio( 1.0 )
 , m_generalValue( generalValue )
 , m_unit( unit )
diff --git a/kspread/kspread_generalProperty.h b/kspread/kspread_generalProperty.h
index 43effc527..1d0d49369 100644
--- a/kspread/kspread_generalProperty.h
+++ b/kspread/kspread_generalProperty.h
@@ -57,7 +57,7 @@ public:
         Height = 64
     };
 
-    GeneralProperty( TQWidget *tqparent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit );
+    GeneralProperty( TQWidget *parent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit );
     ~GeneralProperty();
 
     int getGeneralPropertyChange() const;
diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc
index 7440b990c..9257a3f57 100644
--- a/kspread/kspread_object.cc
+++ b/kspread/kspread_object.cc
@@ -367,16 +367,16 @@ void EmbeddedObject::doDelete()
  * EmbeddedKOfficeObject
  *
  **********************************************************/
-EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *tqparent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry )
-    : EmbeddedObject( _sheet, tqgeometry ), m_parent(tqparent)
+EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry )
+    : EmbeddedObject( _sheet, tqgeometry ), m_parent(parent)
 {
-    m_embeddedObject = new KoDocumentChild(tqparent, doc, tqgeometry.toTQRect() );
+    m_embeddedObject = new KoDocumentChild(parent, doc, tqgeometry.toTQRect() );
 }
 
-EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *tqparent, Sheet *_sheet )
-    : EmbeddedObject( _sheet, KoRect() ), m_parent(tqparent)
+EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet )
+    : EmbeddedObject( _sheet, KoRect() ), m_parent(parent)
 {
-    m_embeddedObject = new KoDocumentChild( tqparent );
+    m_embeddedObject = new KoDocumentChild( parent );
 }
 
 EmbeddedKOfficeObject::~EmbeddedKOfficeObject()
@@ -384,7 +384,7 @@ EmbeddedKOfficeObject::~EmbeddedKOfficeObject()
   delete m_embeddedObject;
 }
 
-Doc* EmbeddedKOfficeObject::tqparent()
+Doc* EmbeddedKOfficeObject::parent()
 {
     return m_parent;
 }
diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h
index c111490e8..46074109a 100644
--- a/kspread/kspread_object.h
+++ b/kspread/kspread_object.h
@@ -238,14 +238,14 @@ class EmbeddedObject
 class EmbeddedKOfficeObject : public EmbeddedObject
 {
   public:
-    EmbeddedKOfficeObject( Doc *tqparent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry );
-    EmbeddedKOfficeObject( Doc *tqparent, Sheet *_sheet );
+    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; }
     virtual TQString getTypeString() const
         { return i18n("Embedded Object"); }
 
-    Doc* tqparent();
+    Doc* parent();
     KoDocumentChild *embeddedObject();
 
     bool load( const TQDomElement& element );
diff --git a/kspread/kspread_propertyEditor.cpp b/kspread/kspread_propertyEditor.cpp
index 857af71cb..6f38c25e3 100644
--- a/kspread/kspread_propertyEditor.cpp
+++ b/kspread/kspread_propertyEditor.cpp
@@ -38,8 +38,8 @@
 
 using namespace KSpread;
 
-PropertyEditor::PropertyEditor( TQWidget *tqparent, const char *name, Sheet *page, Doc *doc )
-    : TQTabDialog( tqparent, name, true )
+PropertyEditor::PropertyEditor( TQWidget *parent, const char *name, Sheet *page, Doc *doc )
+    : TQTabDialog( parent, name, true )
     , m_page( page )
     , m_doc( doc )
     , m_objects( page->getSelectedObjects() )
diff --git a/kspread/kspread_propertyEditor.h b/kspread/kspread_propertyEditor.h
index a8a32013e..3da5507e4 100644
--- a/kspread/kspread_propertyEditor.h
+++ b/kspread/kspread_propertyEditor.h
@@ -46,7 +46,7 @@ class PropertyEditor : public TQTabDialog
   TQ_OBJECT
 
 public:
-    PropertyEditor( TQWidget *tqparent = 0, const char *name = 0, Sheet *page = 0, Doc *doc = 0 );
+    PropertyEditor( TQWidget *parent = 0, const char *name = 0, Sheet *page = 0, Doc *doc = 0 );
     ~PropertyEditor();
 
     KCommand * getCommand();
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index 6c27757ca..09abcf8aa 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -6514,10 +6514,10 @@ bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext&
 }
 
 
-void Sheet::loadOasisObjects( const TQDomElement &tqparent, KoOasisLoadingContext& oasisContext )
+void Sheet::loadOasisObjects( const TQDomElement &parent, KoOasisLoadingContext& oasisContext )
 {
     TQDomElement e;
-    TQDomNode n = tqparent.firstChild();
+    TQDomNode n = parent.firstChild();
     while( !n.isNull() )
     {
         e = n.toElement();
@@ -7172,7 +7172,7 @@ void Sheet::convertPart( const TQString & part, KoXmlWriter & xmlWriter ) const
                     t.setAttribute( "text:date-value", "0-00-00" );
                     // todo: "style:data-style-name", "N2"
                     t.appendChild( dd.createTextNode( TQDate::tqcurrentDate().toString() ) );
-                    tqparent.appendChild( t );
+                    parent.appendChild( t );
 #endif
                 }
                 else if ( var == "<time>" )
diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc
index e1bbbf52d..af5b91a1b 100644
--- a/kspread/kspread_style.cc
+++ b/kspread/kspread_style.cc
@@ -183,7 +183,7 @@ bool Style::operator == (const Style& style) const
 
 void Style::loadOasisStyle( KoOasisStyles& oasisStyles, const TQDomElement & element )
 {
-  // NOTE Stefan: Don't fill the style stack with the tqparent styles!
+  // NOTE Stefan: Don't fill the style stack with the parent styles!
   KoStyleStack styleStack;
   styleStack.push( element );
   styleStack.setTypeProperties( "table-cell" );
@@ -1131,10 +1131,10 @@ void Style::saveOasisStyle( KoGenStyle &style, KoGenStyles &mainStyles )
     //  kdDebug() << "AUTO" << endl;
 #endif
 
-    // don't store tqparent, if it's the default style
+    // don't store parent, if it's the default style
     if ( m_parent && (m_parent->type() != BUILTIN || m_parent->name() != "Default") )
-        // FIXME this is not the OASIS tqparent style's name. it's its display name!
-        style.addAttribute( "style:tqparent-style-name", m_parent->name() );
+        // FIXME this is not the OASIS parent style's name. it's its display name!
+        style.addAttribute( "style:parent-style-name", m_parent->name() );
 
     if ( featureSet( SAlignX ) && alignX() != Format::Undefined )
     {
@@ -1803,14 +1803,14 @@ bool Style::loadXML( TQDomElement & format )
   return true;
 }
 
-void Style::setParent( CustomStyle * tqparent )
+void Style::setParent( CustomStyle * parent )
 {
-  m_parent = tqparent;
+  m_parent = parent;
   if ( m_parent )
     m_parentName = m_parent->name();
 }
 
-CustomStyle * Style::tqparent() const
+CustomStyle * Style::parent() const
 {
   return m_parent;
 }
@@ -1871,7 +1871,7 @@ bool Style::hasFeature( FlagsSet f, bool withoutParent ) const
 {
   bool b = ( m_featuresSet & (uint) f );
 
-  // check if feature is defined here or at tqparent level
+  // check if feature is defined here or at parent level
   if ( m_parent && !withoutParent )
     b = ( m_parent->hasFeature( f, withoutParent ) ? true : b );
 
@@ -2699,7 +2699,7 @@ CustomStyle::CustomStyle()
   m_parent = 0;
 }
 
-CustomStyle::CustomStyle( Style * tqparent, TQString const & name )
+CustomStyle::CustomStyle( Style * parent, TQString const & name )
   : Style(),
     m_name( name )
 {
@@ -2707,52 +2707,52 @@ CustomStyle::CustomStyle( Style * tqparent, TQString const & name )
   m_parent = 0;
 
   // one to one copy
-  if ( tqparent->hasProperty( PDontPrintText ) )
+  if ( parent->hasProperty( PDontPrintText ) )
     addProperty( PDontPrintText );
-  if ( tqparent->hasProperty( PCustomFormat ) )
+  if ( parent->hasProperty( PCustomFormat ) )
     addProperty( PCustomFormat );
-  if ( tqparent->hasProperty( PNotProtected ) )
+  if ( parent->hasProperty( PNotProtected ) )
     addProperty( PNotProtected );
-  if ( tqparent->hasProperty( PHideAll ) )
+  if ( parent->hasProperty( PHideAll ) )
     addProperty( PHideAll );
-  if ( tqparent->hasProperty( PHideFormula ) )
+  if ( parent->hasProperty( PHideFormula ) )
     addProperty( PHideFormula );
-  if ( tqparent->hasProperty( PMultiRow ) )
+  if ( parent->hasProperty( PMultiRow ) )
     addProperty( PMultiRow );
-  if ( tqparent->hasProperty( PVerticalText ) )
+  if ( parent->hasProperty( PVerticalText ) )
     addProperty( PVerticalText );
 
-  changeAlignX( tqparent->alignX() );
-  changeAlignY( tqparent->alignY() );
-  changeFloatFormat( tqparent->floatFormat() );
-  changeFloatColor( tqparent->floatColor() );
-  changeFormatType( tqparent->formatType() );
-  changeFontFamily( tqparent->fontFamily() );
-  changeFontSize( tqparent->fontSize() );
-  changeFontFlags( tqparent->fontFlags() );
-  changePen( tqparent->pen() );
-  changeBgColor( tqparent->bgColor() );
-  changeRightBorderPen( tqparent->rightBorderPen() );
-  changeBottomBorderPen( tqparent->bottomBorderPen() );
-  changeLeftBorderPen( tqparent->leftBorderPen() );
-  changeTopBorderPen( tqparent->topBorderPen() );
-  changeFallBorderPen( tqparent->fallDiagonalPen() );
-  changeGoUpBorderPen( tqparent->goUpDiagonalPen() );
-  changeBackGroundBrush( tqparent->backGroundBrush() );
-  changeRotateAngle( tqparent->rotateAngle() );
-  changeIndent( tqparent->indent() );
-  changeStrFormat( tqparent->strFormat() );
-  changePrecision( tqparent->precision() );
-  changePrefix( tqparent->prefix() );
-  changePostfix( tqparent->postfix() );
-  changeCurrency( tqparent->currency() );
-}
-
-CustomStyle::CustomStyle( TQString const & name, CustomStyle * tqparent )
+  changeAlignX( parent->alignX() );
+  changeAlignY( parent->alignY() );
+  changeFloatFormat( parent->floatFormat() );
+  changeFloatColor( parent->floatColor() );
+  changeFormatType( parent->formatType() );
+  changeFontFamily( parent->fontFamily() );
+  changeFontSize( parent->fontSize() );
+  changeFontFlags( parent->fontFlags() );
+  changePen( parent->pen() );
+  changeBgColor( parent->bgColor() );
+  changeRightBorderPen( parent->rightBorderPen() );
+  changeBottomBorderPen( parent->bottomBorderPen() );
+  changeLeftBorderPen( parent->leftBorderPen() );
+  changeTopBorderPen( parent->topBorderPen() );
+  changeFallBorderPen( parent->fallDiagonalPen() );
+  changeGoUpBorderPen( parent->goUpDiagonalPen() );
+  changeBackGroundBrush( parent->backGroundBrush() );
+  changeRotateAngle( parent->rotateAngle() );
+  changeIndent( parent->indent() );
+  changeStrFormat( parent->strFormat() );
+  changePrecision( parent->precision() );
+  changePrefix( parent->prefix() );
+  changePostfix( parent->postfix() );
+  changeCurrency( parent->currency() );
+}
+
+CustomStyle::CustomStyle( TQString const & name, CustomStyle * parent )
   : Style(),
     m_name( name )
 {
-  m_parent = tqparent;
+  m_parent = parent;
   if ( m_parent )
     m_parentName = m_parent->name();
 }
@@ -2800,8 +2800,8 @@ TQString CustomStyle::saveOasis( KoGenStyle& style, KoGenStyles &mainStyles )
 void CustomStyle::loadOasis( KoOasisStyles& oasisStyles, const TQDomElement& style, const TQString & name )
 {
     m_name = name;
-    if ( style.hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
-        m_parentName = style.attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
+    if ( style.hasAttributeNS( KoXmlNS::style, "parent-style-name" ) )
+        m_parentName = style.attributeNS( KoXmlNS::style, "parent-style-name", TQString() );
     else if ( m_name != "Default" )
         m_parentName = "Default";
 
@@ -2818,7 +2818,7 @@ void CustomStyle::save( TQDomDocument & doc, TQDomElement & styles )
   TQDomElement style( doc.createElement( "style" ) );
   style.setAttribute( "type", (int) m_type );
   if ( m_parent )
-    style.setAttribute( "tqparent", m_parent->name() );
+    style.setAttribute( "parent", m_parent->name() );
   style.setAttribute( "name", m_name );
 
   TQDomElement format( doc.createElement( "format" ) );
@@ -2832,8 +2832,8 @@ bool CustomStyle::loadXML( TQDomElement const & style, TQString const & name )
 {
   m_name = name;
 
-  if ( style.hasAttribute( "tqparent" ) )
-    m_parentName = style.attribute( "tqparent" );
+  if ( style.hasAttribute( "parent" ) )
+    m_parentName = style.attribute( "parent" );
 
   if ( !style.hasAttribute( "type" ) )
     return false;
diff --git a/kspread/kspread_style.h b/kspread/kspread_style.h
index 58922a065..2ae6299cf 100644
--- a/kspread/kspread_style.h
+++ b/kspread/kspread_style.h
@@ -121,7 +121,7 @@ public:
    * Constructor.
    * Creates an automatic style.
    * If @p style is a custom or built-in style (e.g. the default style),
-   * @p style becomes the tqparent style. In this case, features are NOT SET.
+   * @p style becomes the parent style. In this case, features are NOT SET.
    * @param style The style which features are copied.
    */
   Style( Style* style );
@@ -261,9 +261,9 @@ public:
   Style * setProperty( Properties p );
   Style * clearProperty( Properties p );
 
-  CustomStyle * tqparent() const;
+  CustomStyle * parent() const;
   TQString const & parentName() const { return m_parentName; }
-  void setParent( CustomStyle * tqparent );
+  void setParent( CustomStyle * parent );
 
   /**
    * Returns the name of a colour.  This is the same as returned by TQColor::name, but an internal cache
@@ -412,7 +412,7 @@ public:
    * @param name The name of this style.
    */
   CustomStyle( Style * style, TQString const & name );
-  CustomStyle( TQString const & name, CustomStyle * tqparent );
+  CustomStyle( TQString const & name, CustomStyle * parent );
   ~CustomStyle();
 
   TQString const & name() const { return m_name; }
@@ -426,7 +426,7 @@ public:
   virtual TQString saveOasis( KoGenStyle& style, KoGenStyles &mainStyles );
   /**
    * Loads the style properties from @p style .
-   * Determines also the tqparent's name.
+   * Determines also the parent's name.
    * @param oasisStyles map of all styles
    * @param style the DOM element defining the style
    * @param name the style's new name
diff --git a/kspread/kspread_style_manager.cc b/kspread/kspread_style_manager.cc
index 61ca57114..47ca18ccd 100644
--- a/kspread/kspread_style_manager.cc
+++ b/kspread/kspread_style_manager.cc
@@ -108,9 +108,9 @@ void StyleManager::loadOasisStyleTemplate( KoOasisStyles& oasisStyles )
         if ( !name.isEmpty() )
         {
             CustomStyle * style = 0;
-            if ( styleElem.hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
-                // The style's tqparent name will be set in Style::loadOasis(..).
-                // After all styles are loaded the pointer to the tqparent is set.
+            if ( styleElem.hasAttributeNS( KoXmlNS::style, "parent-style-name" ) )
+                // The style's parent name will be set in Style::loadOasis(..).
+                // After all styles are loaded the pointer to the parent is set.
                 style = new CustomStyle( name, 0 );
             else
                 style = new CustomStyle( name, m_defaultStyle );
@@ -124,7 +124,7 @@ void StyleManager::loadOasisStyleTemplate( KoOasisStyles& oasisStyles )
         }
     }
 
-    // set the tqparent pointers after we loaded all styles
+    // set the parent pointers after we loaded all styles
     Styles::iterator iter = m_styles.begin();
     Styles::iterator end  = m_styles.end();
     while ( iter != end )
@@ -132,7 +132,7 @@ void StyleManager::loadOasisStyleTemplate( KoOasisStyles& oasisStyles )
         CustomStyle * styleData = iter.data();
 
         if ( styleData->name() != "Default" )
-            if ( !styleData->tqparent() && !styleData->parentName().isNull() )
+            if ( !styleData->parent() && !styleData->parentName().isNull() )
                 styleData->setParent( m_oasisStyles[ styleData->parentName() ] );
 
         ++iter;
@@ -182,7 +182,7 @@ bool StyleManager::loadXML( TQDomElement const & styles )
     else if ( !name.isNull() )
     {
       CustomStyle * style = 0;
-      if ( e.hasAttribute( "tqparent" ) && e.attribute( "tqparent" ) == "Default" )
+      if ( e.hasAttribute( "parent" ) && e.attribute( "parent" ) == "Default" )
         style = new CustomStyle( name, m_defaultStyle );
       else
         style = new CustomStyle( name, 0 );
@@ -209,7 +209,7 @@ bool StyleManager::loadXML( TQDomElement const & styles )
   {
     CustomStyle * styleData = iter.data();
 
-    if ( !styleData->tqparent() && !styleData->parentName().isNull() )
+    if ( !styleData->parent() && !styleData->parentName().isNull() )
       styleData->setParent( m_styles[ styleData->parentName() ] );
 
     ++iter;
@@ -257,15 +257,15 @@ CustomStyle * StyleManager::style( TQString const & name ) const
 
 void StyleManager::takeStyle( CustomStyle * style )
 {
-  CustomStyle * tqparent = style->tqparent();
+  CustomStyle * parent = style->parent();
 
   Styles::iterator iter = m_styles.begin();
   Styles::iterator end  = m_styles.end();
 
   while ( iter != end )
   {
-    if ( iter.data()->tqparent() == style )
-      iter.data()->setParent( tqparent );
+    if ( iter.data()->parent() == style )
+      iter.data()->setParent( parent );
 
     ++iter;
   }
@@ -279,10 +279,10 @@ void StyleManager::takeStyle( CustomStyle * style )
   }
 }
 
-bool StyleManager::checkCircle( TQString const & name, TQString const & tqparent )
+bool StyleManager::checkCircle( TQString const & name, TQString const & parent )
 {
-  CustomStyle * s = style( tqparent );
-  if ( !s || s->tqparent() == 0 )
+  CustomStyle * s = style( parent );
+  if ( !s || s->parent() == 0 )
     return true;
   if ( s->parentName() == name )
     return false;
@@ -363,14 +363,14 @@ TQDict<Style> StyleManager::loadOasisAutoStyles( KoOasisStyles& oasisStyles )
       autoStyles.insert( name , new Style());
       autoStyles[name]->loadOasisStyle( oasisStyles , *(it.current()) );
 
-      if ( it.current()->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
+      if ( it.current()->hasAttributeNS( KoXmlNS::style, "parent-style-name" ) )
       {
-        TQString parentStyleName = it.current()->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
+        TQString parentStyleName = it.current()->attributeNS( KoXmlNS::style, "parent-style-name", TQString() );
         if ( m_oasisStyles.contains( parentStyleName ) )
         {
           autoStyles[name]->setParent( m_oasisStyles[parentStyleName] );
         }
-        kdDebug() << "\t tqparent-style-name:" << parentStyleName << endl;
+        kdDebug() << "\t parent-style-name:" << parentStyleName << endl;
       }
       else
       {
diff --git a/kspread/kspread_style_manager.h b/kspread/kspread_style_manager.h
index d4bf10bb9..68e98ff0a 100644
--- a/kspread/kspread_style_manager.h
+++ b/kspread/kspread_style_manager.h
@@ -53,7 +53,7 @@ class KSPREAD_EXPORT StyleManager
   CustomStyle * defaultStyle() const { return m_defaultStyle; }
   CustomStyle * style( TQString const & name ) const;
 
-  bool checkCircle( TQString const & name, TQString const & tqparent );
+  bool checkCircle( TQString const & name, TQString const & parent );
   bool validateStyleName( TQString const & name, CustomStyle * style );
   void changeName( TQString const & oldName, TQString const & newName );
 
diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cc
index a22be5bbd..4a3ed94af 100644
--- a/kspread/kspread_toolbox.cc
+++ b/kspread/kspread_toolbox.cc
@@ -28,8 +28,8 @@
 
 using namespace KSpread;
 
-ToolBox::ToolBox( TQWidget* tqparent, const char* name )
-    : TQFrame( tqparent, name, WType_TopLevel | WStyle_Tool )
+ToolBox::ToolBox( TQWidget* parent, const char* name )
+    : TQFrame( parent, name, WType_TopLevel | WStyle_Tool )
 {
     KWin::setType( winId(), NET::Tool );
 
@@ -115,8 +115,8 @@ void ToolBox::mouseMoveEvent( TQMouseEvent* ev )
 
 // ---------------------------------------------
 
-KoTransformToolBox::KoTransformToolBox( KoDocumentChild* ch, TQWidget* tqparent, const char* name )
-    : ToolBox( tqparent, name )
+KoTransformToolBox::KoTransformToolBox( KoDocumentChild* ch, TQWidget* parent, const char* name )
+    : ToolBox( parent, name )
 {
     m_child = 0;
 
diff --git a/kspread/kspread_toolbox.h b/kspread/kspread_toolbox.h
index ef5a2c89b..6ec17ac07 100644
--- a/kspread/kspread_toolbox.h
+++ b/kspread/kspread_toolbox.h
@@ -36,7 +36,7 @@ class KOFFICEUI_EXPORT ToolBox : public TQFrame
     Q_OBJECT
   TQ_OBJECT
 public:
-    ToolBox( TQWidget* tqparent = 0, const char* name = 0 );
+    ToolBox( TQWidget* parent = 0, const char* name = 0 );
 
 public slots:
     void setEnabled( bool enable );
@@ -58,7 +58,7 @@ class KOFFICEUI_EXPORT KoTransformToolBox : public ToolBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoTransformToolBox( KoDocumentChild* child, TQWidget* tqparent = 0, const char* name = 0 );
+    KoTransformToolBox( KoDocumentChild* child, TQWidget* parent = 0, const char* name = 0 );
 
     double rotation() const;
     double scaling() const;
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index 8d1d8ddff..7f6be54b3 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -1403,8 +1403,8 @@ TQButton* View::Private::newIconButton( const char *_file, bool _kbutton, TQWidg
   }
 }
 
-KPSheetSelectPage::KPSheetSelectPage( TQWidget *tqparent )
-: KPrintDialogPage(tqparent),
+KPSheetSelectPage::KPSheetSelectPage( TQWidget *parent )
+: KPrintDialogPage(parent),
   gui(new SheetSelectWidget(this))
 {
   setTitle(gui->caption());
@@ -1898,7 +1898,7 @@ View::~View()
 
     delete d->actions;
     // NOTE Stefan: Delete the Canvas explicitly, even if it has this view as
-    //              tqparent. Otherwise, it leads to crashes, because it tries to
+    //              parent. Otherwise, it leads to crashes, because it tries to
     //              access this View in some events (Bug #126492).
     delete d->canvas;
     delete d;
diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h
index 4d6eb96fe..727638007 100644
--- a/kspread/kspread_view.h
+++ b/kspread/kspread_view.h
@@ -82,7 +82,7 @@ class KPSheetSelectPage : public KPrintDialogPage
   Q_OBJECT
   TQ_OBJECT
   public:
-    KPSheetSelectPage( TQWidget *tqparent = 0 );
+    KPSheetSelectPage( TQWidget *parent = 0 );
 //     ~KPSheetSelectPage();
 
 //     //reimplement virtual functions
diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp
index 545ddcb5f..cec641931 100644
--- a/kspread/plugins/calculator/configdlg.cpp
+++ b/kspread/plugins/calculator/configdlg.cpp
@@ -38,8 +38,8 @@
 #undef HAVE_LONG_DOUBLE
 #endif
 
-ConfigDlg::ConfigDlg(TQWidget *tqparent, const char *name, DefStruct *defstruct)
-  : TQDialog(tqparent, name)
+ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct)
+  : TQDialog(parent, name)
 {
   defst = defstruct;
 
@@ -158,7 +158,7 @@ ConfigDlg::ConfigDlg(TQWidget *tqparent, const char *name, DefStruct *defstruct)
   connect(button3,TQT_SIGNAL(clicked()),this,TQT_SLOT(help()));
 
   lay1->addWidget(box);
-  connect(tqparent,TQT_SIGNAL(applyButtonPressed()),TQT_SLOT(okButton()));
+  connect(parent,TQT_SIGNAL(applyButtonPressed()),TQT_SLOT(okButton()));
 }
 
 void ConfigDlg::help()
diff --git a/kspread/plugins/calculator/configdlg.h b/kspread/plugins/calculator/configdlg.h
index 7462f0281..2cb999120 100644
--- a/kspread/plugins/calculator/configdlg.h
+++ b/kspread/plugins/calculator/configdlg.h
@@ -53,7 +53,7 @@ Q_OBJECT
 
 public:
 
-  ConfigDlg(TQWidget *tqparent=0, const char *name=0, DefStruct *defstruct=NULL);
+  ConfigDlg(TQWidget *parent=0, const char *name=0, DefStruct *defstruct=NULL);
 
   ~ConfigDlg() {}
 
diff --git a/kspread/plugins/calculator/dlabel.cpp b/kspread/plugins/calculator/dlabel.cpp
index 011642c57..c051d0f3d 100644
--- a/kspread/plugins/calculator/dlabel.cpp
+++ b/kspread/plugins/calculator/dlabel.cpp
@@ -26,8 +26,8 @@
 
 #include "dlabel.h"
 
-DLabel::DLabel(TQWidget *tqparent, const char *name)
-  :TQLabel(tqparent,name){
+DLabel::DLabel(TQWidget *parent, const char *name)
+  :TQLabel(parent,name){
 
     button = 0;
     lit = false;
diff --git a/kspread/plugins/calculator/dlabel.h b/kspread/plugins/calculator/dlabel.h
index 1ed800968..58e6bda59 100644
--- a/kspread/plugins/calculator/dlabel.h
+++ b/kspread/plugins/calculator/dlabel.h
@@ -39,7 +39,7 @@ Q_OBJECT
 
 public:
 
-DLabel(TQWidget *tqparent=0, const char *name=0);
+DLabel(TQWidget *parent=0, const char *name=0);
 
   ~DLabel() {}
 
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index dc92e9f50..4c80e7b49 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -43,8 +43,8 @@ extern num_base        current_base;
 
 TQPtrList<CALCAMNT>       temp_stack;
 
-TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *tqparent, const char *name )
-  : TQDialog( tqparent, name )
+TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char *name )
+  : TQDialog( parent, name )
 {
 
     corba = _corba;
diff --git a/kspread/plugins/calculator/kcalc.h b/kspread/plugins/calculator/kcalc.h
index 7e665e6c9..dfa67b633 100644
--- a/kspread/plugins/calculator/kcalc.h
+++ b/kspread/plugins/calculator/kcalc.h
@@ -203,7 +203,7 @@ class TQtCalculator : public TQDialog
 
 public:
 
-    TQtCalculator( Calculator* _corba, TQWidget *tqparent=0, const char *name=0 );
+    TQtCalculator( Calculator* _corba, TQWidget *parent=0, const char *name=0 );
     ~TQtCalculator();
 
     void keyPressEvent( TQKeyEvent *e );
diff --git a/kspread/plugins/calculator/kcalc_core.cpp b/kspread/plugins/calculator/kcalc_core.cpp
index 7a6f82096..bdba8469f 100644
--- a/kspread/plugins/calculator/kcalc_core.cpp
+++ b/kspread/plugins/calculator/kcalc_core.cpp
@@ -1720,11 +1720,11 @@ int cvb(char *out_str, long amount, int max_digits)
                         lead_one = 1,
                         lead_one_count = 0,
                         work_size = sizeof(amount) * CHAR_BIT;
-        unsigned long   bit_tqmask = (1 << ((sizeof(amount) * CHAR_BIT) - 1));
+        unsigned long   bit_mask = (1 << ((sizeof(amount) * CHAR_BIT) - 1));
 
-        while (bit_tqmask) {
+        while (bit_mask) {
 
-                if (amount & bit_tqmask) {
+                if (amount & bit_mask) {
                         if (lead_one)
                                 lead_one_count++;
                         lead_zero = 0;
@@ -1734,7 +1734,7 @@ int cvb(char *out_str, long amount, int max_digits)
                         if (!lead_zero)
                                 work_str[work_char++] = '0';
                 }
-                bit_tqmask >>= 1;
+                bit_mask >>= 1;
         }
         if (!work_char)
                 work_str[work_char++] = '0';
diff --git a/kspread/plugins/calculator/main.cpp b/kspread/plugins/calculator/main.cpp
index c6efb99f7..2f1a0b89e 100644
--- a/kspread/plugins/calculator/main.cpp
+++ b/kspread/plugins/calculator/main.cpp
@@ -43,8 +43,8 @@ K_EXPORT_COMPONENT_FACTORY( libkspreadcalc, CalcFactory )
 
 KInstance* CalcFactory::s_global = 0;
 
-CalcFactory::CalcFactory( TQObject* tqparent, const char* name )
-    : KLibFactory( tqparent, name )
+CalcFactory::CalcFactory( TQObject* parent, const char* name )
+    : KLibFactory( parent, name )
 {
     s_global = new KInstance( "kspreadcalc" );
 }
@@ -54,15 +54,15 @@ CalcFactory::~CalcFactory()
     delete s_global;
 }
 
-TQObject* CalcFactory::createObject( TQObject* tqparent, const char* name, const char* /*classname*/, const TQStringList & )
+TQObject* CalcFactory::createObject( TQObject* parent, const char* name, const char* /*classname*/, const TQStringList & )
 {
-    if ( !tqparent->inherits("KSpread::View") )
+    if ( !parent->inherits("KSpread::View") )
     {
-        kdError() << "CalcFactory: KSpread::View expected. Parent is " << tqparent->className() << endl;
+        kdError() << "CalcFactory: KSpread::View expected. Parent is " << parent->className() << endl;
         return 0;
     }
 
-    TQObject *obj = new Calculator( (View*)tqparent, name );
+    TQObject *obj = new Calculator( (View*)parent, name );
     return obj;
 }
 
@@ -77,14 +77,14 @@ KInstance* CalcFactory::global()
  *
  ***************************************************/
 
-Calculator::Calculator( View* tqparent, const char* name )
-    : KParts::Plugin( tqparent, name )
+Calculator::Calculator( View* parent, const char* name )
+    : KParts::Plugin( parent, name )
 {
     m_calc = 0;
-    m_view = tqparent;
+    m_view = parent;
 
     KGlobal::locale()->insertCatalogue("kspreadcalc_calc");
-    tqparent->installEventFilter( this );
+    parent->installEventFilter( this );
 
     (void)new KAction( i18n("Calculator"), SmallIcon("kcalc", CalcFactory::global()),
                        0, this, TQT_SLOT( showCalculator() ), actionCollection(), "kspreadcalc");
@@ -99,7 +99,7 @@ void Calculator::showCalculator()
         return;
     }
 
-     m_calc = new TQtCalculator( this, (View*)tqparent() );
+     m_calc = new TQtCalculator( this, (View*)parent() );
      m_calc->setFixedSize( 9 + 100 + 9 + 233 + 9, 239);
      m_calc->show();
      m_calc->raise();
diff --git a/kspread/plugins/calculator/main.h b/kspread/plugins/calculator/main.h
index dc5eb3a58..a0284b200 100644
--- a/kspread/plugins/calculator/main.h
+++ b/kspread/plugins/calculator/main.h
@@ -42,10 +42,10 @@ class CalcFactory : public KLibFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    CalcFactory( TQObject* tqparent = 0, const char* name = 0 );
+    CalcFactory( TQObject* parent = 0, const char* name = 0 );
     ~CalcFactory();
 
-    virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0,
+    virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
 			     const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
     static KInstance* global();
@@ -59,7 +59,7 @@ class KSPREAD_EXPORT Calculator : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    Calculator( View* tqparent, const char* name = 0 );
+    Calculator( View* parent, const char* name = 0 );
     ~Calculator();
 
     View* view() { return m_view; }
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
index 4a465eed5..d55c332b6 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
@@ -33,8 +33,8 @@
 namespace KSpread
 {
 
-InsertCalendarDialog::InsertCalendarDialog(TQWidget* tqparent, const char* name)
-: InsertCalendarDialogBase(tqparent,name)
+InsertCalendarDialog::InsertCalendarDialog(TQWidget* parent, const char* name)
+: InsertCalendarDialogBase(parent,name)
 {
   this->m_datePicker = NULL;
   
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.h b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.h
index f68ab4c68..11b0670aa 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.h
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.h
@@ -56,7 +56,7 @@ class KSPREAD_EXPORT InsertCalendarDialog : public InsertCalendarDialogBase
      * The dates in the dialog initialize to a complete calendar for the
      * current month.
      */
-    InsertCalendarDialog(TQWidget* tqparent = 0, const char* name = 0);
+    InsertCalendarDialog(TQWidget* parent = 0, const char* name = 0);
 
     /**
      * Virtual destructor.
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
index 558f59cb4..1bb16a959 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
@@ -50,15 +50,15 @@ typedef KGenericFactory<PluginInsertCalendar> InsertCalendarFactory;
 K_EXPORT_COMPONENT_FACTORY( libkspreadinsertcalendar,  InsertCalendarFactory("kspreadinsertcalendar"))
 
 
-PluginInsertCalendar::PluginInsertCalendar( TQObject *tqparent, const char *name, const TQStringList& /*args*/ )
-: Plugin(tqparent,name)
+PluginInsertCalendar::PluginInsertCalendar( TQObject *parent, const char *name, const TQStringList& /*args*/ )
+: Plugin(parent,name)
 {
     this->m_kspreadView = NULL;
-    if (tqparent)
+    if (parent)
     {
-      if (tqparent->inherits("KSpread::View"))
+      if (parent->inherits("KSpread::View"))
       {
-        this->m_kspreadView = (View*)tqparent;
+        this->m_kspreadView = (View*)parent;
       }
       else
       {
@@ -67,7 +67,7 @@ PluginInsertCalendar::PluginInsertCalendar( TQObject *tqparent, const char *name
     }
     else
     {
-      kdWarning() << "Plugin created without a tqparent!!!" << endl;
+      kdWarning() << "Plugin created without a parent!!!" << endl;
     }
 
 
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h
index be93fea5e..e0c2ef890 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h
@@ -57,7 +57,7 @@ class KSPREAD_EXPORT PluginInsertCalendar : public KParts::Plugin
   protected:
 
     /**
-     * This is the tqparent part of the plugin. It is used
+     * This is the parent part of the plugin. It is used
      * to access the spreadsheet and actually insert the
      * calendar.
      *
@@ -78,7 +78,7 @@ class KSPREAD_EXPORT PluginInsertCalendar : public KParts::Plugin
     /**
      * Constructor. This constructor is usable with KGenericFactory.
      */
-    PluginInsertCalendar( TQObject *tqparent, const char *name, const TQStringList& args );
+    PluginInsertCalendar( TQObject *parent, const char *name, const TQStringList& args );
 
     /**
      * Virtual destructor.
diff --git a/kspread/plugins/scripting/scripting.cc b/kspread/plugins/scripting/scripting.cc
index e4299e263..44f8fa014 100644
--- a/kspread/plugins/scripting/scripting.cc
+++ b/kspread/plugins/scripting/scripting.cc
@@ -37,21 +37,21 @@
 typedef KGenericFactory<Scripting> KSpreadScriptingFactory;
 K_EXPORT_COMPONENT_FACTORY( kspreadscripting, KSpreadScriptingFactory( "kspreadscripting" ) )
 
-Scripting::Scripting(TQObject *tqparent, const char *name, const TQStringList &)
-        : KParts::Plugin(tqparent, name)
+Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &)
+        : KParts::Plugin(parent, name)
 {
     setInstance(KSpreadScriptingFactory::instance());
 
     kdDebug() << "Scripting plugin. Class: "
           << tqmetaObject()->className()
           << ", Parent: "
-          << tqparent->tqmetaObject()->className()
+          << parent->tqmetaObject()->className()
           << "\n";
 
-    if ( tqparent->inherits("KSpread::View") )
+    if ( parent->inherits("KSpread::View") )
     {
         setInstance(Scripting::instance());
-        m_view = (KSpread::View*) tqparent;
+        m_view = (KSpread::View*) parent;
         m_scriptguiclient = new Kross::Api::ScriptGUIClient( m_view, m_view );
 //         m_scriptguiclient ->setXMLFile(locate("data","kspreadplugins/scripting.rc"), true);
         kdDebug() << "Setup actions for scripting !" << endl;
diff --git a/kspread/plugins/scripting/scripting.h b/kspread/plugins/scripting/scripting.h
index b8bd3a558..4fb8112fb 100644
--- a/kspread/plugins/scripting/scripting.h
+++ b/kspread/plugins/scripting/scripting.h
@@ -37,7 +37,7 @@ class Scripting : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
     public:
-        Scripting(TQObject *tqparent, const char *name, const TQStringList &);
+        Scripting(TQObject *parent, const char *name, const TQStringList &);
         virtual ~Scripting();
     private slots:
         void executionFinished(const Kross::Api::ScriptAction*);
diff --git a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
index d4ab99ed7..a34a4dd14 100755
--- a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
+++ b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
@@ -21,14 +21,14 @@ except (ImportError):
 	raise "Failed to import the required PyQt python module."
 
 class Dialog(qt.QDialog):
-	def __init__(self, scriptpath, tqparent):
+	def __init__(self, scriptpath, parent):
 		self.scriptpath = scriptpath
 
 		import krosskspreadcore
 		self.doc = krosskspreadcore.get("KSpreadDocument")
 
 		import qt
-		qt.QDialog.__init__(self, tqparent, "Dialog", 1, qt.Qt.WDestructiveClose)
+		qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose)
 		self.setCaption("Export to HTML File")
 		tqlayout = qt.QVBoxLayout(self)
 		box = qt.QVBox(self)
diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
index f434bce53..7afde8b96 100755
--- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
+++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
@@ -54,8 +54,8 @@ class EditWidget(Widget):
 		return self.edit.text()
 
 class FileWidget(Widget):
-	def __init__(self, parentwidget, label, filtertqmask, openfiledialog = True):
-		self.filtertqmask = filtertqmask
+	def __init__(self, parentwidget, label, filtermask, openfiledialog = True):
+		self.filtermask = filtermask
 		self.openfiledialog = openfiledialog
 		import qt
 		global Widget
@@ -68,9 +68,9 @@ class FileWidget(Widget):
 		import qt
 		text = str( self.edit.text() )
 		if self.openfiledialog:
-			filename = str( qt.QFileDialog.getOpenFileName(text, self.filtertqmask, self.parentwidget) )
+			filename = str( qt.QFileDialog.getOpenFileName(text, self.filtermask, self.parentwidget) )
 		else:
-			filename = qt.QFileDialog.getSaveFileName(text, self.filtertqmask, self.parentwidget)
+			filename = qt.QFileDialog.getSaveFileName(text, self.filtermask, self.parentwidget)
 		if filename != "": self.edit.setText( filename )
 	def value(self):
 		return self.edit.text()
@@ -105,9 +105,9 @@ class Samples:
 		class PrintDriverDetails:
 			"""  Print a the list of available KexiDB drivers and print details about one of them. """
 			name = "Details about a driver"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
-					"DriverName" : Samples.KexiDB._DriverWidget( tqparent.parentwidget ),
+					"DriverName" : Samples.KexiDB._DriverWidget( parent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -125,9 +125,9 @@ class Samples:
 		class ConnectWithFile:
 			""" Connect with a KexiDB database by using a Kexi Connection Project File. """
 			name = "Connect with file"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
-					"ProjectFile" : Samples.KexiDB._ProjectWidget( tqparent.parentwidget ),
+					"ProjectFile" : Samples.KexiDB._ProjectWidget( parent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -164,10 +164,10 @@ class Samples:
 		class IterateThroughTable:
 			""" Iterate through a table within a connected KexiDB database. """
 			name = "Iterate through table"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
-					"ProjectFile" : Samples.KexiDB._ProjectWidget( tqparent.parentwidget ),
-					"TableName" : Samples.KexiDB._TableWidget( tqparent.parentwidget ),
+					"ProjectFile" : Samples.KexiDB._ProjectWidget( parent.parentwidget ),
+					"TableName" : Samples.KexiDB._TableWidget( parent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -261,12 +261,12 @@ class Samples:
 		class SetTextOfCells:
 			""" Set the text of the defined cells. """
 			name = "Set text of cells"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				pass
 				self.widgets = {
-					"SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget ),
-					"Cells" : Samples.KSpread._CellsWidget( tqparent.parentwidget ),
-					"Value" : Samples.KSpread._ValueWidget( tqparent.parentwidget ),
+					"SheetName" : Samples.KSpread._SheetWidget( parent.parentwidget ),
+					"Cells" : Samples.KSpread._CellsWidget( parent.parentwidget ),
+					"Value" : Samples.KSpread._ValueWidget( parent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -292,13 +292,13 @@ class Samples:
 		class SetColorsOfCells:
 			""" Set the colors of the defined cells. """
 			name = "Set colors of cells"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				pass
 				self.widgets = {
-					"SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget),
-					"Cells" : Samples.KSpread._CellsWidget( tqparent.parentwidget ),
-					"TextColor" : Samples.KSpread._ColorWidget( tqparent.parentwidget, "Textcolor", "ff0000" ),
-					"BackgroundColor" : Samples.KSpread._ColorWidget( tqparent.parentwidget, "Backgroundcolor", "c0c0c0" ),
+					"SheetName" : Samples.KSpread._SheetWidget( parent.parentwidget),
+					"Cells" : Samples.KSpread._CellsWidget( parent.parentwidget ),
+					"TextColor" : Samples.KSpread._ColorWidget( parent.parentwidget, "Textcolor", "ff0000" ),
+					"BackgroundColor" : Samples.KSpread._ColorWidget( parent.parentwidget, "Backgroundcolor", "c0c0c0" ),
 				}
 			def getCode(self):
 				return (
@@ -324,10 +324,10 @@ class Samples:
 		class IterateThroughCellsWithContent:
 			""" Iterate over all cells in a sheet that have content (aka that are not empty). """
 			name = "Iterate through cells"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				pass
 				self.widgets = {
-					"SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget ),
+					"SheetName" : Samples.KSpread._SheetWidget( parent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -352,9 +352,9 @@ class Samples:
 		class PrintSheetDetails:
 			""" Print details about the current sheet. """
 			name = "Details about a sheet"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
-					"SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget ),
+					"SheetName" : Samples.KSpread._SheetWidget( parent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -376,10 +376,10 @@ class Samples:
 		class LoadDocFromNativeXML:
 			""" Load the document from a native XML file. """
 			name = "Load document from native XML File"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				global FileWidget
 				self.widgets = {
-					"FileName" : FileWidget( tqparent.parentwidget, "XML File:", "*.xml;;*" ),
+					"FileName" : FileWidget( parent.parentwidget, "XML File:", "*.xml;;*" ),
 				}
 			def getCode(self):
 				return (
@@ -413,10 +413,10 @@ class Samples:
 		class SaveDocToNativeXML:
 			""" Save the document to a native XML file. """
 			name = "Save document to native XML File"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				global FileWidget
 				self.widgets = {
-					"FileName" : FileWidget( tqparent.parentwidget, "XML File:", "*.xml;;*", False ),
+					"FileName" : FileWidget( parent.parentwidget, "XML File:", "*.xml;;*", False ),
 				}
 			def getCode(self):
 				return (
@@ -451,10 +451,10 @@ class Samples:
 		class CopySheets:
 			""" Copy the text-content from one sheet to another. """
 			name = "Copy sheets"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
-					"SourceSheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget, "Source sheet:" ),
-					"TargetSheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget, "Target sheet:" ),
+					"SourceSheet" : Samples.KSpread._SheetWidget( parent.parentwidget, "Source sheet:" ),
+					"TargetSheet" : Samples.KSpread._SheetWidget( parent.parentwidget, "Target sheet:" ),
 				}
 			def getCode(self):
 				return (
@@ -480,10 +480,10 @@ class Samples:
 		class LoadSheetFromCSV:
 			""" Load the content of a CSV file into a KSpread sheet. """
 			name = "Load data from CSV file into sheet"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
-					"Sheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget ),
-					"FileName" : FileWidget( tqparent.parentwidget, "CSV File:", "*.csv;;*", True ),
+					"Sheet" : Samples.KSpread._SheetWidget( parent.parentwidget ),
+					"FileName" : FileWidget( parent.parentwidget, "CSV File:", "*.csv;;*", True ),
 				}
 			def getCode(self):
 				return (
@@ -519,10 +519,10 @@ class Samples:
 		class SaveSheetToCSV:
 			""" Save the content of a KSpread sheet into a CSV file. """
 			name = "Save data from a sheet into a CSV file"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
-					"Sheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget ),
-					"FileName" : FileWidget( tqparent.parentwidget, "CSV File:", "*.csv;;*", False ),
+					"Sheet" : Samples.KSpread._SheetWidget( parent.parentwidget ),
+					"FileName" : FileWidget( parent.parentwidget, "CSV File:", "*.csv;;*", False ),
 				}
 			def getCode(self):
 				return (
@@ -563,10 +563,10 @@ class Samples:
 		class OpenFileDialog:
 			""" Show the usage of the openfile dialog with QFileDialog. """
 			name = "Open File Dialog"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				pass
 				self.widgets = {
-					"FileName" : FileWidget( tqparent.parentwidget, "Open File:", "*.txt *.html;;*" ),
+					"FileName" : FileWidget( parent.parentwidget, "Open File:", "*.txt *.html;;*" ),
 				}
 			def getCode(self):
 				return (
@@ -578,10 +578,10 @@ class Samples:
 		class SaveFileDialog:
 			""" Show the usage of the savefile dialog with QFileDialog. """
 			name = "Save File Dialog"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				pass
 				self.widgets = {
-					"FileName" : FileWidget( tqparent.parentwidget, "Save File:", "*.txt *.html;;*", False ),
+					"FileName" : FileWidget( parent.parentwidget, "Save File:", "*.txt *.html;;*", False ),
 				}
 			def getCode(self):
 				return (
@@ -593,7 +593,7 @@ class Samples:
 		class CustomDialog:
 			""" Show a custom dialog that inherits a QDialog. """
 			name = "Custom Dialog"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				pass
 				self.widgets = {
 				}
@@ -602,9 +602,9 @@ class Samples:
 					'import qt',
 					'',
 					'class MyDialog(qt.QDialog):',
-					'	def __init__(self, tqparent):',
+					'	def __init__(self, parent):',
 					'		import qt',
-					'		qt.QDialog.__init__(self, tqparent, "MyDialog", 1, qt.Qt.WDestructiveClose)',
+					'		qt.QDialog.__init__(self, parent, "MyDialog", 1, qt.Qt.WDestructiveClose)',
 					'		self.setCaption("My Dialog")',
 					'		btn = qt.QPushButton("Click me",self)',
 					'		qt.QObject.connect(btn, qt.SIGNAL("clicked()"), self.buttonClicked)',
@@ -619,11 +619,11 @@ class Samples:
 		class InputDialog:
 			""" Show how to use a QInputDialog. """
 			name = "Input Dialog"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				global EditWidget
 				self.widgets = {
-					"Caption" : EditWidget( tqparent.parentwidget, "Caption" ),
-					"Message" : EditWidget( tqparent.parentwidget, "Message" ),
+					"Caption" : EditWidget( parent.parentwidget, "Caption" ),
+					"Message" : EditWidget( parent.parentwidget, "Message" ),
 				}
 			def getCode(self):
 				return (
@@ -646,7 +646,7 @@ class Samples:
 		class PrintClipboard:
 			""" Print the content from the clipper via DCOP. """
 			name = "Clipboard content"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
 				}
 			def getCode(self):
@@ -663,7 +663,7 @@ class Samples:
 		class AmarokCollectionInfos:
 			""" Fetch some collection informations from the amarok collection via DCOP. """
 			name = "amarok collection infos"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
 				}
 			def getCode(self):
@@ -688,7 +688,7 @@ class Samples:
 		class KopeteContacts:
 			""" Print the names of all contacts Kopete knows via DCOP. """
 			name = "Kopete contacts"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
 				}
 			def getCode(self):
@@ -711,7 +711,7 @@ class Samples:
 		class KWordSelectedText:
 			""" Get the selected text from a KWord instance via DCOP. """
 			name = "KWord selected text"
-			def __init__(self, tqparent):
+			def __init__(self, parent):
 				self.widgets = {
 				}
 			def getCode(self):
@@ -759,9 +759,9 @@ class Samples:
 # Dialog implementations.
 
 class SampleDialog(qt.QDialog):
-	def __init__(self, tqparent, sampleclazz, samplechildclazz):
+	def __init__(self, parent, sampleclazz, samplechildclazz):
 		import qt
-		qt.QDialog.__init__(self, tqparent, "SampleDialog", 1)
+		qt.QDialog.__init__(self, parent, "SampleDialog", 1)
 
 		tqlayout = qt.QVBoxLayout(self)
 		box = qt.QVBox(self)
@@ -817,7 +817,7 @@ class SampleDialog(qt.QDialog):
 		return code
 
 class MainDialog(qt.QDialog):
-	def __init__(self, scriptpath, tqparent):
+	def __init__(self, scriptpath, parent):
 		self.scriptpath = scriptpath
 		if not hasattr(__main__,"scripteditorfilename"):
 			__main__.scripteditorfilename = self.getFileName("myscript.py")
@@ -826,7 +826,7 @@ class MainDialog(qt.QDialog):
 		self.doc = krosskspreadcore.get("KSpreadDocument")
 
 		import os, qt
-		qt.QDialog.__init__(self, tqparent, "MainDialog", 1, qt.Qt.WDestructiveClose)
+		qt.QDialog.__init__(self, parent, "MainDialog", 1, qt.Qt.WDestructiveClose)
 		self.setCaption("Script Editor")
 		
 		tqlayout = qt.QVBoxLayout(self)
diff --git a/kspread/templates/Business/BalanceSheet.kst b/kspread/templates/Business/BalanceSheet.kst
index d64220248..b0cc5374e 100644
--- a/kspread/templates/Business/BalanceSheet.kst
+++ b/kspread/templates/Business/BalanceSheet.kst
@@ -38,17 +38,17 @@
    <printrepeatcolumns right="0" left="0" />
    <printrepeatrows bottom="0" top="0" />
    <cell row="20" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="20" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="20" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -67,22 +67,22 @@
     <result outStr="0" dataType="Num" >0</result>
    </cell>
    <cell row="20" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="19" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="19" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="19" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -101,22 +101,22 @@
     <result outStr="0" dataType="Num" >0</result>
    </cell>
    <cell row="19" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="18" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="18" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="18" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -135,150 +135,150 @@
     <result outStr="0" dataType="Num" >0</result>
    </cell>
    <cell row="18" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="17" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="17" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="17" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="17" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="17" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="6" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="6" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="6" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="6" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="6" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="5" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="5" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="5" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="4" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="4" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="3" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="2" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="2" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="2" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="2" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="2" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="1" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="1" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="1" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="20" column="2" >
-    <format tqparent="Default" align="3" >
+    <format parent="Default" align="3" >
      <font size="11" family="Arial" weight="50" />
     </format>
     <text outStr="Current Balance" dataType="Str" >Current Balance</text>
    </cell>
    <cell row="19" column="2" >
-    <format tqparent="Default" align="3" >
+    <format parent="Default" align="3" >
      <font size="11" family="Arial" weight="50" />
     </format>
     <text outStr="Payables" dataType="Str" >Payables</text>
    </cell>
    <cell row="18" column="2" >
-    <format tqparent="Default" align="3" >
+    <format parent="Default" align="3" >
      <font size="11" family="Arial" weight="50" />
     </format>
     <text outStr="Receivable" dataType="Str" >Receivable</text>
    </cell>
    <cell row="16" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -292,7 +292,7 @@
     </format>
    </cell>
    <cell row="15" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -303,7 +303,7 @@
     </format>
    </cell>
    <cell row="14" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -314,7 +314,7 @@
     </format>
    </cell>
    <cell row="13" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -325,7 +325,7 @@
     </format>
    </cell>
    <cell row="12" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -336,7 +336,7 @@
     </format>
    </cell>
    <cell row="11" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -347,7 +347,7 @@
     </format>
    </cell>
    <cell row="10" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -358,7 +358,7 @@
     </format>
    </cell>
    <cell row="9" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -369,7 +369,7 @@
     </format>
    </cell>
    <cell row="8" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -383,7 +383,7 @@
     </format>
    </cell>
    <cell row="16" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -397,7 +397,7 @@
     </format>
    </cell>
    <cell row="15" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -408,7 +408,7 @@
     </format>
    </cell>
    <cell row="14" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -419,7 +419,7 @@
     </format>
    </cell>
    <cell row="13" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -430,7 +430,7 @@
     </format>
    </cell>
    <cell row="12" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -441,7 +441,7 @@
     </format>
    </cell>
    <cell row="11" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -452,7 +452,7 @@
     </format>
    </cell>
    <cell row="10" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -463,7 +463,7 @@
     </format>
    </cell>
    <cell row="9" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -474,7 +474,7 @@
     </format>
    </cell>
    <cell row="8" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -488,7 +488,7 @@
     </format>
    </cell>
    <cell row="16" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -502,7 +502,7 @@
     </format>
    </cell>
    <cell row="15" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -513,7 +513,7 @@
     </format>
    </cell>
    <cell row="14" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -524,7 +524,7 @@
     </format>
    </cell>
    <cell row="13" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -535,7 +535,7 @@
     </format>
    </cell>
    <cell row="12" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -546,7 +546,7 @@
     </format>
    </cell>
    <cell row="11" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -557,7 +557,7 @@
     </format>
    </cell>
    <cell row="10" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -568,7 +568,7 @@
     </format>
    </cell>
    <cell row="9" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -579,7 +579,7 @@
     </format>
    </cell>
    <cell row="8" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -593,7 +593,7 @@
     </format>
    </cell>
    <cell row="16" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -607,7 +607,7 @@
     </format>
    </cell>
    <cell row="15" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -618,7 +618,7 @@
     </format>
    </cell>
    <cell row="14" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -629,7 +629,7 @@
     </format>
    </cell>
    <cell row="13" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -640,7 +640,7 @@
     </format>
    </cell>
    <cell row="12" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -651,7 +651,7 @@
     </format>
    </cell>
    <cell row="11" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -662,7 +662,7 @@
     </format>
    </cell>
    <cell row="10" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -673,7 +673,7 @@
     </format>
    </cell>
    <cell row="9" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -684,7 +684,7 @@
     </format>
    </cell>
    <cell row="8" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -698,7 +698,7 @@
     </format>
    </cell>
    <cell row="16" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -712,7 +712,7 @@
     </format>
    </cell>
    <cell row="15" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -723,7 +723,7 @@
     </format>
    </cell>
    <cell row="14" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -734,7 +734,7 @@
     </format>
    </cell>
    <cell row="13" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -745,7 +745,7 @@
     </format>
    </cell>
    <cell row="12" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -756,7 +756,7 @@
     </format>
    </cell>
    <cell row="11" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -767,7 +767,7 @@
     </format>
    </cell>
    <cell row="10" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -778,7 +778,7 @@
     </format>
    </cell>
    <cell row="9" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -789,7 +789,7 @@
     </format>
    </cell>
    <cell row="8" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -803,7 +803,7 @@
     </format>
    </cell>
    <cell row="5" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <right-border>
       <pen width="1" style="1" color="#000000" />
@@ -814,7 +814,7 @@
     </format>
    </cell>
    <cell row="5" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -825,7 +825,7 @@
     </format>
    </cell>
    <cell row="4" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <top-border>
       <pen width="1" style="1" color="#000000" />
@@ -836,7 +836,7 @@
     </format>
    </cell>
    <cell row="4" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -847,12 +847,12 @@
     </format>
    </cell>
    <cell row="3" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" italic="yes" />
     </format>
    </cell>
    <cell row="4" column="4" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="11" family="Arial" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -876,7 +876,7 @@
     </format>
    </cell>
    <cell row="3" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" italic="yes" />
     </format>
     <text outStr="Starting Balance" dataType="Str" >Starting Balance</text>
@@ -885,7 +885,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="7" column="5" >
-    <format tqparent="Default" align="2" >
+    <format parent="Default" align="2" >
      <font size="11" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -903,7 +903,7 @@
     <text outStr="Balance" dataType="Str" >Balance</text>
    </cell>
    <cell row="7" column="4" >
-    <format tqparent="Default" align="2" >
+    <format parent="Default" align="2" >
      <font size="11" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -921,7 +921,7 @@
     <text outStr="Payment" dataType="Str" >Payment</text>
    </cell>
    <cell row="7" column="3" >
-    <format tqparent="Default" align="2" >
+    <format parent="Default" align="2" >
      <font size="11" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -939,7 +939,7 @@
     <text outStr="Received" dataType="Str" >Received</text>
    </cell>
    <cell row="7" column="2" >
-    <format tqparent="Default" align="2" >
+    <format parent="Default" align="2" >
      <font size="11" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -957,7 +957,7 @@
     <text outStr="Items" dataType="Str" >Items</text>
    </cell>
    <cell row="7" column="1" >
-    <format tqparent="Default" align="2" >
+    <format parent="Default" align="2" >
      <font size="11" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -975,23 +975,23 @@
     <text outStr="Date" dataType="Str" >Date</text>
    </cell>
    <cell row="3" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" />
     </format>
    </cell>
    <cell row="3" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="11" family="Arial" weight="50" italic="yes" />
     </format>
     <text outStr="Description" dataType="Str" >Description</text>
    </cell>
    <cell row="1" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="24" family="Arial" bold="yes" weight="75" />
     </format>
    </cell>
    <cell row="1" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="24" family="Arial" bold="yes" weight="75" />
     </format>
     <text outStr="Balance Sheet" dataType="Str" >Balance Sheet</text>
diff --git a/kspread/templates/Business/PackingSlip.kst b/kspread/templates/Business/PackingSlip.kst
index 9dc0e4041..fb7d065b6 100644
--- a/kspread/templates/Business/PackingSlip.kst
+++ b/kspread/templates/Business/PackingSlip.kst
@@ -39,7 +39,7 @@
    <printrepeatcolumns right="0" left="0" />
    <printrepeatrows bottom="0" top="0" />
    <cell row="1" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="28" family="Arial" weight="50" italic="yes" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -64,7 +64,7 @@
     <text outStr="Your Company" dataType="Str" >Your Company</text>
    </cell>
    <cell row="1" column="2" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="12" family="Arial" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -92,7 +92,7 @@
     <text outStr="Order Date" dataType="Str" >Order Date</text>
    </cell>
    <cell row="6" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -116,7 +116,7 @@
     <text outStr="Order Number" dataType="Str" >Order Number</text>
    </cell>
    <cell row="7" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -132,7 +132,7 @@
     </format>
    </cell>
    <cell row="8" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -152,25 +152,25 @@
     <text outStr="SHIP TO" dataType="Str" >SHIP TO</text>
    </cell>
    <cell row="11" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="12" family="Arial" weight="50" italic="yes" />
     </format>
     <text outStr="Name" dataType="Str" >Name</text>
    </cell>
    <cell row="12" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="12" family="Arial" weight="50" italic="yes" />
     </format>
     <text outStr="Address" dataType="Str" >Address</text>
    </cell>
    <cell row="13" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="12" family="Arial" weight="50" italic="yes" />
     </format>
     <text outStr="City" dataType="Str" >City</text>
    </cell>
    <cell row="14" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="12" family="Arial" weight="50" italic="yes" />
     </format>
     <text outStr="Phone/Fax" dataType="Str" >Phone/Fax</text>
@@ -184,7 +184,7 @@
     <text outStr="Customer ID" dataType="Str" >Customer ID</text>
    </cell>
    <cell row="7" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -207,7 +207,7 @@
     <text outStr="BILL TO" dataType="Str" >BILL TO</text>
    </cell>
    <cell row="11" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="12" family="Arial" weight="50" italic="yes" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -232,7 +232,7 @@
     <text outStr="Name" dataType="Str" >Name</text>
    </cell>
    <cell row="12" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="12" family="Arial" weight="50" italic="yes" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -257,7 +257,7 @@
     <text outStr="Address" dataType="Str" >Address</text>
    </cell>
    <cell row="13" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="12" family="Arial" weight="50" italic="yes" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -282,7 +282,7 @@
     <text outStr="City" dataType="Str" >City</text>
    </cell>
    <cell row="14" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="12" family="Arial" weight="50" italic="yes" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -310,7 +310,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="17" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" align="2" >
+    <format bgcolor="#ffffff" parent="Default" align="2" >
      <font size="12" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -328,7 +328,7 @@
     <text outStr="Product" dataType="Str" >Product</text>
    </cell>
    <cell row="17" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" align="2" >
+    <format bgcolor="#ffffff" parent="Default" align="2" >
      <font size="12" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -352,7 +352,7 @@
     <text outStr="Description" dataType="Str" >Description</text>
    </cell>
    <cell row="17" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" align="2" >
+    <format bgcolor="#ffffff" parent="Default" align="2" >
      <font size="12" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -370,7 +370,7 @@
     <text outStr="Unit Type" dataType="Str" >Unit Type</text>
    </cell>
    <cell row="17" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" align="2" >
+    <format bgcolor="#ffffff" parent="Default" align="2" >
      <font size="12" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -388,7 +388,7 @@
     <text outStr="Order Qty" dataType="Str" >Order Qty</text>
    </cell>
    <cell row="17" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" align="2" >
+    <format bgcolor="#ffffff" parent="Default" align="2" >
      <font size="12" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -409,26 +409,26 @@
     <format style-name="Default" />
    </cell>
    <cell row="1" column="3" >
-    <format bgcolor="#ffffff" alignY="2" tqparent="Default" />
+    <format bgcolor="#ffffff" alignY="2" parent="Default" />
    </cell>
    <cell row="1" column="4" >
     <format style-name="Default" />
    </cell>
    <cell row="1" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="26" family="Arial" bold="yes" weight="75" />
      <pen width="0" style="1" color="#b2b2b2" />
     </format>
     <text outStr="PACKING SLIP" dataType="Str" >PACKING SLIP</text>
    </cell>
    <cell row="1" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="26" family="Arial" bold="yes" weight="75" />
      <pen width="0" style="1" color="#b2b2b2" />
     </format>
    </cell>
    <cell row="1" column="7" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="12" family="Arial" bold="yes" weight="75" />
      <pen width="0" style="1" color="#b2b2b2" />
     </format>
@@ -437,7 +437,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="17" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" align="2" >
+    <format bgcolor="#ffffff" parent="Default" align="2" >
      <font size="12" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -460,7 +460,7 @@
     </format>
    </cell>
    <cell row="18" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -473,7 +473,7 @@
     </format>
    </cell>
    <cell row="19" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -483,7 +483,7 @@
     </format>
    </cell>
    <cell row="20" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -493,7 +493,7 @@
     </format>
    </cell>
    <cell row="21" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -503,7 +503,7 @@
     </format>
    </cell>
    <cell row="22" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -513,7 +513,7 @@
     </format>
    </cell>
    <cell row="23" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -523,7 +523,7 @@
     </format>
    </cell>
    <cell row="24" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -533,7 +533,7 @@
     </format>
    </cell>
    <cell row="25" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -543,7 +543,7 @@
     </format>
    </cell>
    <cell row="26" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -553,7 +553,7 @@
     </format>
    </cell>
    <cell row="27" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -563,7 +563,7 @@
     </format>
    </cell>
    <cell row="28" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -573,7 +573,7 @@
     </format>
    </cell>
    <cell row="29" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -583,7 +583,7 @@
     </format>
    </cell>
    <cell row="30" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -596,7 +596,7 @@
     </format>
    </cell>
    <cell row="18" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -606,84 +606,84 @@
     </format>
    </cell>
    <cell row="19" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="20" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="21" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="22" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="23" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="24" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="25" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="26" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="27" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="28" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="29" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
     </format>
    </cell>
    <cell row="30" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -693,7 +693,7 @@
     </format>
    </cell>
    <cell row="18" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <top-border>
       <pen width="1" style="1" color="#000000" />
      </top-border>
@@ -703,84 +703,84 @@
     </format>
    </cell>
    <cell row="19" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="20" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="21" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="22" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="23" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="24" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="25" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="26" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="27" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="28" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="29" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
     </format>
    </cell>
    <cell row="30" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <right-border>
       <pen width="1" style="1" color="#000000" />
      </right-border>
@@ -790,7 +790,7 @@
     </format>
    </cell>
    <cell row="18" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -803,7 +803,7 @@
     </format>
    </cell>
    <cell row="19" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -813,7 +813,7 @@
     </format>
    </cell>
    <cell row="20" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -823,7 +823,7 @@
     </format>
    </cell>
    <cell row="21" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -833,7 +833,7 @@
     </format>
    </cell>
    <cell row="22" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -843,7 +843,7 @@
     </format>
    </cell>
    <cell row="23" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -853,7 +853,7 @@
     </format>
    </cell>
    <cell row="24" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -863,7 +863,7 @@
     </format>
    </cell>
    <cell row="25" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -873,7 +873,7 @@
     </format>
    </cell>
    <cell row="26" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -883,7 +883,7 @@
     </format>
    </cell>
    <cell row="27" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -893,7 +893,7 @@
     </format>
    </cell>
    <cell row="28" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -903,7 +903,7 @@
     </format>
    </cell>
    <cell row="29" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -913,7 +913,7 @@
     </format>
    </cell>
    <cell row="30" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -926,7 +926,7 @@
     </format>
    </cell>
    <cell row="18" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -939,7 +939,7 @@
     </format>
    </cell>
    <cell row="19" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -949,7 +949,7 @@
     </format>
    </cell>
    <cell row="20" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -959,7 +959,7 @@
     </format>
    </cell>
    <cell row="21" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -969,7 +969,7 @@
     </format>
    </cell>
    <cell row="22" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -979,7 +979,7 @@
     </format>
    </cell>
    <cell row="23" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -989,7 +989,7 @@
     </format>
    </cell>
    <cell row="24" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -999,7 +999,7 @@
     </format>
    </cell>
    <cell row="25" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1009,7 +1009,7 @@
     </format>
    </cell>
    <cell row="26" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1019,7 +1019,7 @@
     </format>
    </cell>
    <cell row="27" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1029,7 +1029,7 @@
     </format>
    </cell>
    <cell row="28" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1039,7 +1039,7 @@
     </format>
    </cell>
    <cell row="29" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1049,7 +1049,7 @@
     </format>
    </cell>
    <cell row="30" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1062,7 +1062,7 @@
     </format>
    </cell>
    <cell row="18" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1075,7 +1075,7 @@
     </format>
    </cell>
    <cell row="19" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1085,7 +1085,7 @@
     </format>
    </cell>
    <cell row="20" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1095,7 +1095,7 @@
     </format>
    </cell>
    <cell row="21" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1105,7 +1105,7 @@
     </format>
    </cell>
    <cell row="22" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1115,7 +1115,7 @@
     </format>
    </cell>
    <cell row="23" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1125,7 +1125,7 @@
     </format>
    </cell>
    <cell row="24" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1135,7 +1135,7 @@
     </format>
    </cell>
    <cell row="25" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1145,7 +1145,7 @@
     </format>
    </cell>
    <cell row="26" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1155,7 +1155,7 @@
     </format>
    </cell>
    <cell row="27" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1165,7 +1165,7 @@
     </format>
    </cell>
    <cell row="28" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1175,7 +1175,7 @@
     </format>
    </cell>
    <cell row="29" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1185,7 +1185,7 @@
     </format>
    </cell>
    <cell row="30" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1202,7 +1202,7 @@
     <text outStr="TOTAL" dataType="Str" >TOTAL</text>
    </cell>
    <cell row="31" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1220,7 +1220,7 @@
     <result outStr="0" dataType="Num" >0</result>
    </cell>
    <cell row="31" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="12" family="Arial" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1246,7 +1246,7 @@
     <result outStr="0" dataType="Num" >0</result>
    </cell>
    <cell row="6" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1262,7 +1262,7 @@
     </format>
    </cell>
    <cell row="8" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
diff --git a/kspread/templates/Business/PriceQuotation.kst b/kspread/templates/Business/PriceQuotation.kst
index e4c8d74ba..cb36ab133 100644
--- a/kspread/templates/Business/PriceQuotation.kst
+++ b/kspread/templates/Business/PriceQuotation.kst
@@ -98,7 +98,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="31" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -116,7 +116,7 @@
     <result outStr="$ 0.00" dataType="Num" >0</result>
    </cell>
    <cell row="30" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -138,7 +138,7 @@
     </format>
    </cell>
    <cell row="29" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -160,7 +160,7 @@
     </format>
    </cell>
    <cell row="28" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -182,7 +182,7 @@
     </format>
    </cell>
    <cell row="27" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -204,7 +204,7 @@
     </format>
    </cell>
    <cell row="26" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -226,7 +226,7 @@
     </format>
    </cell>
    <cell row="25" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -248,7 +248,7 @@
     </format>
    </cell>
    <cell row="24" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -270,7 +270,7 @@
     </format>
    </cell>
    <cell row="23" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -292,7 +292,7 @@
     </format>
    </cell>
    <cell row="22" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -314,7 +314,7 @@
     </format>
    </cell>
    <cell row="21" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -336,7 +336,7 @@
     </format>
    </cell>
    <cell row="20" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -358,7 +358,7 @@
     </format>
    </cell>
    <cell row="19" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -380,7 +380,7 @@
     </format>
    </cell>
    <cell row="18" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -402,7 +402,7 @@
     </format>
    </cell>
    <cell row="17" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -424,7 +424,7 @@
     </format>
    </cell>
    <cell row="16" column="5" >
-    <format format="10" faktor="1" symbol="" type="0" tqparent="Default" precision="2" >
+    <format format="10" faktor="1" symbol="" type="0" parent="Default" precision="2" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -446,7 +446,7 @@
     </format>
    </cell>
    <cell row="15" column="5" >
-    <format alignY="2" tqparent="Default" align="2" >
+    <format alignY="2" parent="Default" align="2" >
      <font size="12" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -464,20 +464,20 @@
     <text outStr="AMOUNT" dataType="Str" >AMOUNT</text>
    </cell>
    <cell row="35" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <bottom-border>
       <pen width="1" style="1" color="#000000" />
      </bottom-border>
     </format>
    </cell>
    <cell row="31" column="4" >
-    <format tqparent="Default" align="2" >
+    <format parent="Default" align="2" >
      <font size="12" family="Arial" bold="yes" weight="75" />
     </format>
     <text outStr="TOTAL" dataType="Str" >TOTAL</text>
    </cell>
    <cell row="30" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -499,7 +499,7 @@
     </format>
    </cell>
    <cell row="29" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -521,7 +521,7 @@
     </format>
    </cell>
    <cell row="28" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -543,7 +543,7 @@
     </format>
    </cell>
    <cell row="27" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -565,7 +565,7 @@
     </format>
    </cell>
    <cell row="26" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -587,7 +587,7 @@
     </format>
    </cell>
    <cell row="25" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -609,7 +609,7 @@
     </format>
    </cell>
    <cell row="24" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -631,7 +631,7 @@
     </format>
    </cell>
    <cell row="23" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -653,7 +653,7 @@
     </format>
    </cell>
    <cell row="22" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -675,7 +675,7 @@
     </format>
    </cell>
    <cell row="21" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -697,7 +697,7 @@
     </format>
    </cell>
    <cell row="20" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -719,7 +719,7 @@
     </format>
    </cell>
    <cell row="19" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -741,7 +741,7 @@
     </format>
    </cell>
    <cell row="18" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -763,7 +763,7 @@
     </format>
    </cell>
    <cell row="17" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -785,7 +785,7 @@
     </format>
    </cell>
    <cell row="16" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -807,7 +807,7 @@
     </format>
    </cell>
    <cell row="15" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -826,7 +826,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="30" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -848,7 +848,7 @@
     </format>
    </cell>
    <cell row="29" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -870,7 +870,7 @@
     </format>
    </cell>
    <cell row="28" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -892,7 +892,7 @@
     </format>
    </cell>
    <cell row="27" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -914,7 +914,7 @@
     </format>
    </cell>
    <cell row="26" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -936,7 +936,7 @@
     </format>
    </cell>
    <cell row="25" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -958,7 +958,7 @@
     </format>
    </cell>
    <cell row="24" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -980,7 +980,7 @@
     </format>
    </cell>
    <cell row="23" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1002,7 +1002,7 @@
     </format>
    </cell>
    <cell row="22" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1024,7 +1024,7 @@
     </format>
    </cell>
    <cell row="21" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1046,7 +1046,7 @@
     </format>
    </cell>
    <cell row="20" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1068,7 +1068,7 @@
     </format>
    </cell>
    <cell row="19" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1090,7 +1090,7 @@
     </format>
    </cell>
    <cell row="18" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1112,7 +1112,7 @@
     </format>
    </cell>
    <cell row="17" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1134,7 +1134,7 @@
     </format>
    </cell>
    <cell row="16" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1156,7 +1156,7 @@
     </format>
    </cell>
    <cell row="15" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1175,7 +1175,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="30" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1197,7 +1197,7 @@
     </format>
    </cell>
    <cell row="29" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1219,7 +1219,7 @@
     </format>
    </cell>
    <cell row="28" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1241,7 +1241,7 @@
     </format>
    </cell>
    <cell row="27" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1263,7 +1263,7 @@
     </format>
    </cell>
    <cell row="26" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1285,7 +1285,7 @@
     </format>
    </cell>
    <cell row="25" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1307,7 +1307,7 @@
     </format>
    </cell>
    <cell row="24" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1329,7 +1329,7 @@
     </format>
    </cell>
    <cell row="23" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1351,7 +1351,7 @@
     </format>
    </cell>
    <cell row="22" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1373,7 +1373,7 @@
     </format>
    </cell>
    <cell row="21" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1395,7 +1395,7 @@
     </format>
    </cell>
    <cell row="20" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1417,7 +1417,7 @@
     </format>
    </cell>
    <cell row="19" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1439,7 +1439,7 @@
     </format>
    </cell>
    <cell row="18" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1461,7 +1461,7 @@
     </format>
    </cell>
    <cell row="17" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1483,7 +1483,7 @@
     </format>
    </cell>
    <cell row="16" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -1505,7 +1505,7 @@
     </format>
    </cell>
    <cell row="15" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1525,7 +1525,7 @@
     <text outStr="If you have any questions, please contact" dataType="Str" >If you have any questions, please contact</text>
    </cell>
    <cell row="30" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1547,7 +1547,7 @@
     </format>
    </cell>
    <cell row="29" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1569,7 +1569,7 @@
     </format>
    </cell>
    <cell row="28" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1591,7 +1591,7 @@
     </format>
    </cell>
    <cell row="27" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1613,7 +1613,7 @@
     </format>
    </cell>
    <cell row="26" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1635,7 +1635,7 @@
     </format>
    </cell>
    <cell row="25" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1657,7 +1657,7 @@
     </format>
    </cell>
    <cell row="24" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1679,7 +1679,7 @@
     </format>
    </cell>
    <cell row="23" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1701,7 +1701,7 @@
     </format>
    </cell>
    <cell row="22" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1723,7 +1723,7 @@
     </format>
    </cell>
    <cell row="21" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1745,7 +1745,7 @@
     </format>
    </cell>
    <cell row="20" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1767,7 +1767,7 @@
     </format>
    </cell>
    <cell row="19" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1789,7 +1789,7 @@
     </format>
    </cell>
    <cell row="18" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1811,7 +1811,7 @@
     </format>
    </cell>
    <cell row="17" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1833,7 +1833,7 @@
     </format>
    </cell>
    <cell row="16" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1855,7 +1855,7 @@
     </format>
    </cell>
    <cell row="15" column="1" >
-    <format tqparent="Default" colspan="3" align="2" >
+    <format parent="Default" colspan="3" align="2" >
      <font size="12" family="Arial" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -1873,7 +1873,7 @@
     <text outStr="DESCRIPTION" dataType="Str" >DESCRIPTION</text>
    </cell>
    <cell row="3" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1889,7 +1889,7 @@
     </format>
    </cell>
    <cell row="2" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <bottom-border>
       <pen width="1" style="1" color="#000000" />
      </bottom-border>
@@ -1897,13 +1897,13 @@
     <text outStr="Valid until" dataType="Str" >Valid until</text>
    </cell>
    <cell row="1" column="5" >
-    <format tqparent="Default" align="3" >
+    <format parent="Default" align="3" >
      <font size="12" family="Arial" bold="yes" weight="75" />
      <pen width="0" style="1" color="#cccccc" />
     </format>
    </cell>
    <cell row="1" column="4" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" colspan="1" align="3" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" colspan="1" align="3" >
      <font size="24" family="Arial" bold="yes" weight="75" />
      <pen width="0" style="1" color="#cccccc" />
      <left-border>
@@ -1928,7 +1928,7 @@
     <text outStr="QUOTATION" dataType="Str" >QUOTATION</text>
    </cell>
    <cell row="13" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1944,7 +1944,7 @@
     </format>
    </cell>
    <cell row="11" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1960,7 +1960,7 @@
     </format>
    </cell>
    <cell row="9" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -1980,7 +1980,7 @@
     <text outStr="Fax" dataType="Str" >Fax</text>
    </cell>
    <cell row="12" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -2004,7 +2004,7 @@
     <text outStr="Address" dataType="Str" >Address</text>
    </cell>
    <cell row="10" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -2032,7 +2032,7 @@
     <text outStr="Bill To:" dataType="Str" >Bill To:</text>
    </cell>
    <cell row="8" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <bottom-border>
       <pen width="1" style="1" color="#000000" />
      </bottom-border>
@@ -2047,56 +2047,56 @@
     <text outStr="Phone" dataType="Str" >Phone</text>
    </cell>
    <cell row="4" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <top-border>
       <pen width="1" style="1" color="#000000" />
      </top-border>
     </format>
    </cell>
    <cell row="14" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <top-border>
       <pen width="1" style="1" color="#000000" />
      </top-border>
     </format>
    </cell>
    <cell row="31" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <top-border>
       <pen width="1" style="1" color="#000000" />
      </top-border>
     </format>
    </cell>
    <cell row="31" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <top-border>
       <pen width="1" style="1" color="#000000" />
      </top-border>
     </format>
    </cell>
    <cell row="31" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <top-border>
       <pen width="1" style="1" color="#000000" />
      </top-border>
     </format>
    </cell>
    <cell row="32" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <top-border>
       <pen width="1" style="1" color="#000000" />
      </top-border>
     </format>
    </cell>
    <cell row="4" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <top-border>
       <pen width="1" style="1" color="#000000" />
      </top-border>
     </format>
    </cell>
    <cell row="14" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <bottom-border>
       <pen width="1" style="1" color="#000000" />
      </bottom-border>
@@ -2111,12 +2111,12 @@
     <text outStr="Address" dataType="Str" >Address</text>
    </cell>
    <cell row="1" column="2" >
-    <format alignY="2" tqparent="Default" >
+    <format alignY="2" parent="Default" >
      <font size="26" family="Arial" weight="50" italic="yes" />
     </format>
    </cell>
    <cell row="1" column="1" >
-    <format alignY="2" tqparent="Default" >
+    <format alignY="2" parent="Default" >
      <font size="26" family="Arial" weight="50" italic="yes" />
     </format>
     <text outStr="Your Company" dataType="Str" >Your Company</text>
diff --git a/kspread/templates/HomeFamily/CreditCardTracker.kst b/kspread/templates/HomeFamily/CreditCardTracker.kst
index 196429b71..0a0a8fffa 100644
--- a/kspread/templates/HomeFamily/CreditCardTracker.kst
+++ b/kspread/templates/HomeFamily/CreditCardTracker.kst
@@ -39,7 +39,7 @@
    <printrepeatcolumns right="0" left="0" />
    <printrepeatrows bottom="0" top="0" />
    <cell row="20" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -65,7 +65,7 @@
     <result outStr="14-Jun-2003" dataType="Date" >2003/6/14</result>
    </cell>
    <cell row="19" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -91,7 +91,7 @@
     <result outStr="13-Jun-2003" dataType="Date" >2003/6/13</result>
    </cell>
    <cell row="18" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -117,7 +117,7 @@
     <result outStr="12-Jun-2003" dataType="Date" >2003/6/12</result>
    </cell>
    <cell row="17" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -143,7 +143,7 @@
     <result outStr="11-Jun-2003" dataType="Date" >2003/6/11</result>
    </cell>
    <cell row="16" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -169,7 +169,7 @@
     <result outStr="10-Jun-2003" dataType="Date" >2003/6/10</result>
    </cell>
    <cell row="15" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -195,47 +195,47 @@
     <result outStr="09-Jun-2003" dataType="Date" >2003/6/9</result>
    </cell>
    <cell row="14" column="1" >
-    <format bgcolor="#ffffff" format="201" faktor="1" tqparent="Default" />
+    <format bgcolor="#ffffff" format="201" faktor="1" parent="Default" />
     <text>=#0#-1#+1</text>
     <result outStr="08-Jun-2003" dataType="Date" >2003/6/8</result>
    </cell>
    <cell row="13" column="1" >
-    <format bgcolor="#ffffff" format="201" faktor="1" tqparent="Default" />
+    <format bgcolor="#ffffff" format="201" faktor="1" parent="Default" />
     <text>=#0#-1#+1</text>
     <result outStr="07-Jun-2003" dataType="Date" >2003/6/7</result>
    </cell>
    <cell row="12" column="1" >
-    <format bgcolor="#ffffff" format="201" faktor="1" tqparent="Default" />
+    <format bgcolor="#ffffff" format="201" faktor="1" parent="Default" />
     <text>=#0#-1#+1</text>
     <result outStr="06-Jun-2003" dataType="Date" >2003/6/6</result>
    </cell>
    <cell row="11" column="1" >
-    <format bgcolor="#ffffff" format="201" faktor="1" tqparent="Default" />
+    <format bgcolor="#ffffff" format="201" faktor="1" parent="Default" />
     <text>=#0#-1#+1</text>
     <result outStr="05-Jun-2003" dataType="Date" >2003/6/5</result>
    </cell>
    <cell row="10" column="1" >
-    <format bgcolor="#ffffff" format="201" faktor="1" tqparent="Default" />
+    <format bgcolor="#ffffff" format="201" faktor="1" parent="Default" />
     <text>=#0#-1#+1</text>
     <result outStr="04-Jun-2003" dataType="Date" >2003/6/4</result>
    </cell>
    <cell row="9" column="1" >
-    <format bgcolor="#ffffff" format="201" faktor="1" tqparent="Default" />
+    <format bgcolor="#ffffff" format="201" faktor="1" parent="Default" />
     <text>=#0#-1#+1</text>
     <result outStr="03-Jun-2003" dataType="Date" >2003/6/3</result>
    </cell>
    <cell row="8" column="1" >
-    <format bgcolor="#ffffff" format="201" faktor="1" tqparent="Default" />
+    <format bgcolor="#ffffff" format="201" faktor="1" parent="Default" />
     <text>=#0#-1#+1</text>
     <result outStr="02-Jun-2003" dataType="Date" >2003/6/2</result>
    </cell>
    <cell row="7" column="1" >
-    <format bgcolor="#ffffff" format="201" faktor="1" tqparent="Default" />
+    <format bgcolor="#ffffff" format="201" faktor="1" parent="Default" />
     <text>=#0#-1#+1</text>
     <result outStr="01-Jun-2003" dataType="Date" >2003/6/1</result>
    </cell>
    <cell row="6" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -261,7 +261,7 @@
     <result outStr="31-May-2003" dataType="Date" >2003/5/31</result>
    </cell>
    <cell row="5" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -289,7 +289,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="3" column="1" >
-    <format bgcolor="#666666" rowspan="1" tqparent="Default" >
+    <format bgcolor="#666666" rowspan="1" parent="Default" >
      <font size="10" bold="yes" weight="75" />
      <pen width="0" style="1" color="#ffffff" />
      <left-border>
@@ -343,7 +343,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="3" column="2" >
-    <format bgcolor="#666666" rowspan="1" tqparent="Default" >
+    <format bgcolor="#666666" rowspan="1" parent="Default" >
      <font size="10" bold="yes" weight="75" />
      <pen width="0" style="1" color="#ffffff" />
      <left-border>
@@ -362,38 +362,38 @@
     <text outStr="Transaction" dataType="Str" >Transaction</text>
    </cell>
    <cell row="14" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="13" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="12" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="11" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="10" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="9" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="8" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="7" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="6" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="5" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text outStr="1,500.00" dataType="Num" >1500</text>
    </cell>
    <cell row="4" column="3" >
-    <format bgcolor="#666666" tqparent="Default" align="2" >
+    <format bgcolor="#666666" parent="Default" align="2" >
      <font size="10" bold="yes" weight="75" />
      <pen width="0" style="1" color="#ffffff" />
      <bottom-border>
@@ -403,7 +403,7 @@
     <text outStr="Balance" dataType="Str" >Balance</text>
    </cell>
    <cell row="3" column="3" >
-    <format bgcolor="#666666" tqparent="Default" align="2" >
+    <format bgcolor="#666666" parent="Default" align="2" >
      <font size="10" bold="yes" weight="75" />
      <pen width="0" style="1" color="#ffffff" />
      <top-border>
@@ -413,41 +413,41 @@
     <text outStr="Beginning" dataType="Str" >Beginning</text>
    </cell>
    <cell row="14" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="13" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="12" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="11" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="10" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="9" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="8" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="7" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text outStr="30.00" dataType="Num" >30</text>
    </cell>
    <cell row="6" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="5" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="4" column="4" >
     <format style-name="Default" />
    </cell>
    <cell row="3" column="4" >
-    <format bgcolor="#666666" rowspan="1" tqparent="Default" >
+    <format bgcolor="#666666" rowspan="1" parent="Default" >
      <font size="10" bold="yes" weight="75" />
      <pen width="0" style="1" color="#ffffff" />
      <left-border>
@@ -466,44 +466,44 @@
     <text outStr="Payment" dataType="Str" >Payment</text>
    </cell>
    <cell row="14" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="13" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="12" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="11" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="10" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="9" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text outStr="16.00" dataType="Num" >16</text>
    </cell>
    <cell row="8" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text outStr="25.00" dataType="Num" >25</text>
    </cell>
    <cell row="7" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="6" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text outStr="40.00" dataType="Num" >40</text>
    </cell>
    <cell row="5" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text outStr="1,405.67" dataType="Num" >1405.67</text>
    </cell>
    <cell row="4" column="5" >
     <format style-name="Default" />
    </cell>
    <cell row="3" column="5" >
-    <format bgcolor="#666666" rowspan="1" tqparent="Default" >
+    <format bgcolor="#666666" rowspan="1" parent="Default" >
      <font size="10" bold="yes" weight="75" />
      <pen width="0" style="1" color="#ffffff" />
      <left-border>
@@ -522,57 +522,57 @@
     <text outStr="Expenses" dataType="Str" >Expenses</text>
    </cell>
    <cell row="14" column="6" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text>=#-3#0#+#-2#0#-#-1#0#+#0#-1#</text>
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="13" column="6" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text>=#-3#0#+#-2#0#-#-1#0#+#0#-1#</text>
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="12" column="6" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text>=#-3#0#+#-2#0#-#-1#0#+#0#-1#</text>
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="11" column="6" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text>=#-3#0#+#-2#0#-#-1#0#+#0#-1#</text>
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="10" column="6" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text>=#-3#0#+#-2#0#-#-1#0#+#0#-1#</text>
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="9" column="6" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text>=#-3#0#+#-2#0#-#-1#0#+#0#-1#</text>
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="8" column="6" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text>=#-3#0#+#-2#0#-#-1#0#+#0#-1#</text>
     <result outStr="59.33" dataType="Num" >59.3299999999999</result>
    </cell>
    <cell row="7" column="6" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text>=#-3#0#+#-2#0#-#-1#0#+#0#-1#</text>
     <result outStr="84.33" dataType="Num" >84.3299999999999</result>
    </cell>
    <cell row="6" column="6" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text>=#-3#0#+#-2#0#-#-1#0#+#0#-1#</text>
     <result outStr="54.33" dataType="Num" >54.3299999999999</result>
    </cell>
    <cell row="5" column="6" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
     <text>=#-3#0#+#-2#0#-#-1#0#</text>
     <result outStr="94.33" dataType="Num" >94.3299999999999</result>
    </cell>
    <cell row="4" column="6" >
-    <format bgcolor="#666666" tqparent="Default" align="2" >
+    <format bgcolor="#666666" parent="Default" align="2" >
      <font size="10" bold="yes" weight="75" />
      <pen width="0" style="1" color="#ffffff" />
      <left-border>
@@ -588,7 +588,7 @@
     <text outStr="Credit" dataType="Str" >Credit</text>
    </cell>
    <cell row="3" column="6" >
-    <format bgcolor="#666666" tqparent="Default" align="2" >
+    <format bgcolor="#666666" parent="Default" align="2" >
      <font size="10" bold="yes" weight="75" />
      <pen width="0" style="1" color="#ffffff" />
      <left-border>
@@ -604,23 +604,23 @@
     <text outStr="Remaining" dataType="Str" >Remaining</text>
    </cell>
    <cell row="1" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="24" bold="yes" weight="75" />
     </format>
     <text outStr="Credit Card Tracker" dataType="Str" >Credit Card Tracker</text>
    </cell>
    <cell row="1" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="24" bold="yes" weight="75" />
     </format>
    </cell>
    <cell row="1" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="10" bold="yes" weight="75" />
     </format>
    </cell>
    <cell row="21" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -646,7 +646,7 @@
     <result outStr="15-Jun-2003" dataType="Date" >2003/6/15</result>
    </cell>
    <cell row="22" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -672,7 +672,7 @@
     <result outStr="16-Jun-2003" dataType="Date" >2003/6/16</result>
    </cell>
    <cell row="23" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -698,7 +698,7 @@
     <result outStr="17-Jun-2003" dataType="Date" >2003/6/17</result>
    </cell>
    <cell row="24" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -724,7 +724,7 @@
     <result outStr="18-Jun-2003" dataType="Date" >2003/6/18</result>
    </cell>
    <cell row="25" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -750,7 +750,7 @@
     <result outStr="19-Jun-2003" dataType="Date" >2003/6/19</result>
    </cell>
    <cell row="26" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -776,7 +776,7 @@
     <result outStr="20-Jun-2003" dataType="Date" >2003/6/20</result>
    </cell>
    <cell row="27" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -802,7 +802,7 @@
     <result outStr="21-Jun-2003" dataType="Date" >2003/6/21</result>
    </cell>
    <cell row="28" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -828,7 +828,7 @@
     <result outStr="22-Jun-2003" dataType="Date" >2003/6/22</result>
    </cell>
    <cell row="29" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -854,7 +854,7 @@
     <result outStr="23-Jun-2003" dataType="Date" >2003/6/23</result>
    </cell>
    <cell row="30" column="1" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="201" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -880,7 +880,7 @@
     <result outStr="24-Jun-2003" dataType="Date" >2003/6/24</result>
    </cell>
    <cell row="15" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -906,7 +906,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="16" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -932,7 +932,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="17" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -958,7 +958,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="18" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -984,7 +984,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="19" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1010,7 +1010,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="20" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1036,7 +1036,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="21" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1062,7 +1062,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="22" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1088,7 +1088,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="23" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1114,7 +1114,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="24" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1140,7 +1140,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="25" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1166,7 +1166,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="26" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1192,7 +1192,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="27" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1218,7 +1218,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="28" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1244,7 +1244,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="29" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1270,7 +1270,7 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="30" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="2" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="2" angle="0" align="4" >
      <font size="10" weight="50" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -1296,148 +1296,148 @@
     <result outStr="43.33" dataType="Num" >43.3299999999999</result>
    </cell>
    <cell row="15" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="15" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="15" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="16" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="16" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="16" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="17" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="17" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="17" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="18" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="18" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="18" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="19" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="19" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="19" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="20" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="20" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="20" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="21" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="21" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="21" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="22" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="22" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="22" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="23" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="23" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="23" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="24" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="24" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="24" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="25" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="25" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="25" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="26" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="26" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="26" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="27" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="27" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="27" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="28" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="28" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="28" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="29" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="29" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="29" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="30" column="3" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="30" column="4" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="30" column="5" >
-    <format bgcolor="#ffffff" format="0" faktor="1" tqparent="Default" precision="2" />
+    <format bgcolor="#ffffff" format="0" faktor="1" parent="Default" precision="2" />
    </cell>
    <cell row="5" column="7" >
     <format style-name="Default" />
@@ -1533,7 +1533,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="3" column="7" >
-    <format bgcolor="#ffffff" tqparent="Default" align="2" />
+    <format bgcolor="#ffffff" parent="Default" align="2" />
    </cell>
    <cell row="4" column="7" >
     <format style-name="Default" />
diff --git a/kspread/templates/HomeFamily/MenuPlan.kst b/kspread/templates/HomeFamily/MenuPlan.kst
index bfc4a10cf..c73e51ff3 100644
--- a/kspread/templates/HomeFamily/MenuPlan.kst
+++ b/kspread/templates/HomeFamily/MenuPlan.kst
@@ -41,7 +41,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="1" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="10" bold="yes" weight="75" />
     </format>
    </cell>
@@ -167,7 +167,7 @@
     </format>
    </cell>
    <cell row="7" column="7" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -183,7 +183,7 @@
     </format>
    </cell>
    <cell row="7" column="6" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -199,7 +199,7 @@
     </format>
    </cell>
    <cell row="7" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -215,7 +215,7 @@
     </format>
    </cell>
    <cell row="7" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -231,7 +231,7 @@
     </format>
    </cell>
    <cell row="7" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -247,7 +247,7 @@
     </format>
    </cell>
    <cell row="7" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -263,7 +263,7 @@
     </format>
    </cell>
    <cell row="6" column="7" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -279,7 +279,7 @@
     </format>
    </cell>
    <cell row="6" column="6" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -295,7 +295,7 @@
     </format>
    </cell>
    <cell row="6" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -311,7 +311,7 @@
     </format>
    </cell>
    <cell row="6" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -327,7 +327,7 @@
     </format>
    </cell>
    <cell row="6" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -343,7 +343,7 @@
     </format>
    </cell>
    <cell row="6" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -359,7 +359,7 @@
     </format>
    </cell>
    <cell row="5" column="7" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -375,7 +375,7 @@
     </format>
    </cell>
    <cell row="5" column="6" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -391,7 +391,7 @@
     </format>
    </cell>
    <cell row="5" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -407,7 +407,7 @@
     </format>
    </cell>
    <cell row="5" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -423,7 +423,7 @@
     </format>
    </cell>
    <cell row="5" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -439,7 +439,7 @@
     </format>
    </cell>
    <cell row="5" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -455,7 +455,7 @@
     </format>
    </cell>
    <cell row="4" column="7" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -471,7 +471,7 @@
     </format>
    </cell>
    <cell row="4" column="6" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -487,7 +487,7 @@
     </format>
    </cell>
    <cell row="4" column="5" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -503,7 +503,7 @@
     </format>
    </cell>
    <cell row="4" column="4" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -519,7 +519,7 @@
     </format>
    </cell>
    <cell row="4" column="3" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -535,7 +535,7 @@
     </format>
    </cell>
    <cell row="4" column="2" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -551,7 +551,7 @@
     </format>
    </cell>
    <cell row="3" column="7" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="2" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="2" >
      <font size="11" bold="yes" weight="75" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -576,7 +576,7 @@
     <text outStr="Fri" dataType="Str" >Fri</text>
    </cell>
    <cell row="3" column="6" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="2" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="2" >
      <font size="11" bold="yes" weight="75" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -601,7 +601,7 @@
     <text outStr="Thu" dataType="Str" >Thu</text>
    </cell>
    <cell row="3" column="5" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="2" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="2" >
      <font size="11" bold="yes" weight="75" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -626,7 +626,7 @@
     <text outStr="Wed" dataType="Str" >Wed</text>
    </cell>
    <cell row="3" column="4" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="2" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="2" >
      <font size="11" bold="yes" weight="75" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -651,7 +651,7 @@
     <text outStr="Tue" dataType="Str" >Tue</text>
    </cell>
    <cell row="3" column="3" >
-    <format tqparent="Default" align="2" >
+    <format parent="Default" align="2" >
      <font size="11" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -669,7 +669,7 @@
     <text outStr="Mon" dataType="Str" >Mon</text>
    </cell>
    <cell row="3" column="2" >
-    <format tqparent="Default" align="2" >
+    <format parent="Default" align="2" >
      <font size="11" bold="yes" weight="75" />
      <left-border>
       <pen width="1" style="1" color="#000000" />
@@ -690,7 +690,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="4" column="1" >
-    <format tqparent="Default" align="3" >
+    <format parent="Default" align="3" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -707,7 +707,7 @@
     <text outStr="Breakfast" dataType="Str" >Breakfast</text>
    </cell>
    <cell row="5" column="1" >
-    <format tqparent="Default" align="3" >
+    <format parent="Default" align="3" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -724,7 +724,7 @@
     <text outStr="Lunch" dataType="Str" >Lunch</text>
    </cell>
    <cell row="6" column="1" >
-    <format tqparent="Default" align="3" >
+    <format parent="Default" align="3" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -741,7 +741,7 @@
     <text outStr="Dinner" dataType="Str" >Dinner</text>
    </cell>
    <cell row="7" column="1" >
-    <format tqparent="Default" align="3" >
+    <format parent="Default" align="3" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -825,7 +825,7 @@
     <text outStr="Bread" dataType="Str" >Bread</text>
    </cell>
    <cell row="1" column="1" >
-    <format tqparent="Default" >
+    <format parent="Default" >
      <font size="22" bold="yes" weight="75" />
     </format>
     <text outStr="Menu Plan" dataType="Str" >Menu Plan</text>
diff --git a/kspread/templates/HomeFamily/VacationChecklist.kst b/kspread/templates/HomeFamily/VacationChecklist.kst
index b6674596b..141ff1e4b 100644
--- a/kspread/templates/HomeFamily/VacationChecklist.kst
+++ b/kspread/templates/HomeFamily/VacationChecklist.kst
@@ -39,7 +39,7 @@
    <printrepeatcolumns right="0" left="0" />
    <printrepeatrows bottom="0" top="0" />
    <cell row="15" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -55,7 +55,7 @@
     </format>
    </cell>
    <cell row="14" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -71,7 +71,7 @@
     </format>
    </cell>
    <cell row="13" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -87,7 +87,7 @@
     </format>
    </cell>
    <cell row="12" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -103,7 +103,7 @@
     </format>
    </cell>
    <cell row="9" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -119,7 +119,7 @@
     </format>
    </cell>
    <cell row="8" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -135,7 +135,7 @@
     </format>
    </cell>
    <cell row="7" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -151,7 +151,7 @@
     </format>
    </cell>
    <cell row="6" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="0" color="#000000" />
      </left-border>
@@ -173,28 +173,28 @@
     </format>
    </cell>
    <cell row="1" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="22" bold="yes" weight="75" />
     </format>
     <text outStr="Vacation Checklist" dataType="Str" >Vacation Checklist</text>
    </cell>
    <cell row="1" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="22" bold="yes" weight="75" />
     </format>
    </cell>
    <cell row="1" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="10" bold="yes" weight="75" />
     </format>
    </cell>
    <cell row="1" column="4" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="10" bold="yes" weight="75" />
     </format>
    </cell>
    <cell row="9" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -210,7 +210,7 @@
     </format>
    </cell>
    <cell row="8" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -226,7 +226,7 @@
     </format>
    </cell>
    <cell row="7" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -242,7 +242,7 @@
     </format>
    </cell>
    <cell row="6" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -258,7 +258,7 @@
     </format>
    </cell>
    <cell row="5" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="12" bold="yes" weight="75" />
     </format>
     <text outStr="TRIP" dataType="Str" >TRIP</text>
@@ -280,7 +280,7 @@
     <text outStr="Check travel insurance" dataType="Str" >Check travel insurance</text>
    </cell>
    <cell row="5" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="12" bold="yes" weight="75" />
     </format>
    </cell>
@@ -291,7 +291,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="5" column="4" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="12" bold="yes" weight="75" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -328,13 +328,13 @@
     <text outStr="House/mortage" dataType="Str" >House/mortage</text>
    </cell>
    <cell row="6" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="10" bold="yes" weight="75" italic="yes" />
     </format>
     <text outStr="Bills" dataType="Str" >Bills</text>
    </cell>
    <cell row="5" column="5" >
-    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" tqparent="Default" precision="-1" angle="0" align="4" >
+    <format brushstyle="0" brushcolor="#ff0000" bgcolor="#ffffff" float="3" alignY="2" format="0" floatcolor="2" faktor="1" indent="0" parent="Default" precision="-1" angle="0" align="4" >
      <font size="12" bold="yes" weight="75" />
      <pen width="0" style="1" color="#000000" />
      <left-border>
@@ -369,7 +369,7 @@
     <text outStr="Return Date" dataType="Str" >Return Date</text>
    </cell>
    <cell row="3" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -385,7 +385,7 @@
     </format>
    </cell>
    <cell row="2" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -401,7 +401,7 @@
     </format>
    </cell>
    <cell row="13" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -417,7 +417,7 @@
     </format>
    </cell>
    <cell row="12" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -441,13 +441,13 @@
     <text outStr="Hotel" dataType="Str" >Hotel</text>
    </cell>
    <cell row="11" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="10" bold="yes" weight="75" italic="yes" />
     </format>
     <text outStr="Reservations" dataType="Str" >Reservations</text>
    </cell>
    <cell row="11" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="10" bold="yes" weight="75" italic="yes" />
     </format>
    </cell>
@@ -460,24 +460,24 @@
     <text outStr="Dairy" dataType="Str" >Dairy</text>
    </cell>
    <cell row="11" column="5" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="10" bold="yes" weight="75" italic="yes" />
     </format>
     <text outStr="Home delivery" dataType="Str" >Home delivery</text>
    </cell>
    <cell row="11" column="6" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="10" bold="yes" weight="75" italic="yes" />
     </format>
    </cell>
    <cell row="20" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="12" bold="yes" weight="75" />
     </format>
     <text outStr="OTHERS" dataType="Str" >OTHERS</text>
    </cell>
    <cell row="18" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -493,7 +493,7 @@
     </format>
    </cell>
    <cell row="17" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -509,7 +509,7 @@
     </format>
    </cell>
    <cell row="16" column="1" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <left-border>
       <pen width="1" style="1" color="#000000" />
      </left-border>
@@ -533,7 +533,7 @@
     <text outStr="Notify police:" dataType="Str" >Notify police:</text>
    </cell>
    <cell row="20" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="12" bold="yes" weight="75" />
     </format>
    </cell>
@@ -550,7 +550,7 @@
     <text outStr="Tuneup" dataType="Str" >Tuneup</text>
    </cell>
    <cell row="15" column="2" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="10" bold="yes" weight="75" italic="yes" />
     </format>
     <text outStr="Auto check" dataType="Str" >Auto check</text>
@@ -562,7 +562,7 @@
     <format style-name="Default" />
    </cell>
    <cell row="15" column="3" >
-    <format bgcolor="#ffffff" tqparent="Default" >
+    <format bgcolor="#ffffff" parent="Default" >
      <font size="10" weight="50" italic="yes" />
     </format>
    </cell>
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp
index 28ed36d1c..0e7355b2f 100644
--- a/kugar/kudesigner/kudesigner_doc.cpp
+++ b/kugar/kudesigner/kudesigner_doc.cpp
@@ -41,8 +41,8 @@
 
 #include "kudesigner_view.h"
 
-KudesignerDoc::KudesignerDoc( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-        : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ), m_plugin( 0 ), m_propPos( DockRight ), m_modified( false )
+KudesignerDoc::KudesignerDoc( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode )
+        : KoDocument( parentWidget, widgetName, parent, name, singleViewMode ), m_plugin( 0 ), m_propPos( DockRight ), m_modified( false )
 {
     setInstance( KudesignerFactory::global(), false );
     setTemplateType("kudesigner_template");
@@ -121,9 +121,9 @@ void KudesignerDoc::initEmpty()
     setModified(false);
 }
 
-KoView* KudesignerDoc::createViewInstance( TQWidget* tqparent, const char* name )
+KoView* KudesignerDoc::createViewInstance( TQWidget* parent, const char* name )
 {
-    return new KudesignerView( this, tqparent, name );
+    return new KudesignerView( this, parent, name );
 }
 
 bool KudesignerDoc::loadOasis( const TQDomDocument&, KoOasisStyles&, const TQDomDocument&, KoStore* )
diff --git a/kugar/kudesigner/kudesigner_doc.h b/kugar/kudesigner/kudesigner_doc.h
index 659b3e1ce..1085a9756 100644
--- a/kugar/kudesigner/kudesigner_doc.h
+++ b/kugar/kudesigner/kudesigner_doc.h
@@ -39,7 +39,7 @@ class KudesignerDoc: public KoDocument
     Q_OBJECT
   TQ_OBJECT
 public:
-    KudesignerDoc( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    KudesignerDoc( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false );
 
     ~KudesignerDoc();
 
@@ -77,7 +77,7 @@ public slots:
     virtual void initEmpty();
 
 protected:
-    virtual KoView* createViewInstance( TQWidget* tqparent, const char* name );
+    virtual KoView* createViewInstance( TQWidget* parent, const char* name );
     virtual bool completeSaving( KoStore* store );
     virtual bool completeLoading( KoStore* store );
 
diff --git a/kugar/kudesigner/kudesigner_factory.cpp b/kugar/kudesigner/kudesigner_factory.cpp
index f8712f034..1f5a8740a 100644
--- a/kugar/kudesigner/kudesigner_factory.cpp
+++ b/kugar/kudesigner/kudesigner_factory.cpp
@@ -29,8 +29,8 @@
 KInstance* KudesignerFactory::s_global = 0L;
 KAboutData* KudesignerFactory::s_aboutData = 0L;
 
-KudesignerFactory::KudesignerFactory( TQObject* tqparent, const char* name )
-        : KoFactory( tqparent, name )
+KudesignerFactory::KudesignerFactory( TQObject* parent, const char* name )
+        : KoFactory( parent, name )
 {
     global();
 }
@@ -43,13 +43,13 @@ KudesignerFactory::~KudesignerFactory()
     s_global = 0L;
 }
 
-KParts::Part* KudesignerFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & data )
+KParts::Part* KudesignerFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & data )
 {
     // If classname is "KoDocument", our host is a koffice application
     // otherwise, the host wants us as a simple part, so switch to readonly and single view.
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
     // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    KudesignerDoc *part = new KudesignerDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    KudesignerDoc *part = new KudesignerDoc( parentWidget, widgetName, parent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
         part->setReadWrite( false );
diff --git a/kugar/kudesigner/kudesigner_factory.h b/kugar/kudesigner/kudesigner_factory.h
index fd8956f64..1cf4e1036 100644
--- a/kugar/kudesigner/kudesigner_factory.h
+++ b/kugar/kudesigner/kudesigner_factory.h
@@ -30,10 +30,10 @@ class KUGARDESIGNER_EXPORT KudesignerFactory : public KoFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    KudesignerFactory( TQObject* tqparent = 0, const char* name = 0 );
+    KudesignerFactory( TQObject* parent = 0, const char* name = 0 );
     ~KudesignerFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp
index 4533813db..991d8304d 100644
--- a/kugar/kudesigner/kudesigner_view.cpp
+++ b/kugar/kudesigner/kudesigner_view.cpp
@@ -68,8 +68,8 @@
 
 using namespace Kudesigner;
 
-KudesignerView::KudesignerView( KudesignerDoc* part, TQWidget* tqparent, const char* name )
-        : KoView( part, tqparent, name ), m_propertyEditor( 0 ), m_doc( part )
+KudesignerView::KudesignerView( KudesignerDoc* part, TQWidget* parent, const char* name )
+        : KoView( part, parent, name ), m_propertyEditor( 0 ), m_doc( part )
 {
     setInstance( KudesignerFactory::global() );
     if ( !part->isReadWrite() )  // readonly case, e.g. when embedded into konqueror
diff --git a/kugar/kudesigner/kudesigner_view.h b/kugar/kudesigner/kudesigner_view.h
index 2b1cc7524..26cd96484 100644
--- a/kugar/kudesigner/kudesigner_view.h
+++ b/kugar/kudesigner/kudesigner_view.h
@@ -61,7 +61,7 @@ class KudesignerView: public KoView
     friend class Kudesigner::View;
 
 public:
-    KudesignerView( KudesignerDoc* part, TQWidget* tqparent = 0, const char* name = 0 );
+    KudesignerView( KudesignerDoc* part, TQWidget* parent = 0, const char* name = 0 );
     virtual ~KudesignerView();
 
     Kudesigner::View *view()
diff --git a/kugar/kudesigner_lib/plugin.cpp b/kugar/kudesigner_lib/plugin.cpp
index 880fc37f0..c92cee579 100644
--- a/kugar/kudesigner_lib/plugin.cpp
+++ b/kugar/kudesigner_lib/plugin.cpp
@@ -17,7 +17,7 @@
 
 #include "plugin.h"
 
-KuDesignerPlugin::KuDesignerPlugin( TQObject *tqparent, const char *name, const TQStringList& ) : TQObject( tqparent, name )
+KuDesignerPlugin::KuDesignerPlugin( TQObject *parent, const char *name, const TQStringList& ) : TQObject( parent, name )
 {}
 KuDesignerPlugin::~KuDesignerPlugin()
 {}
diff --git a/kugar/kudesigner_lib/plugin.h b/kugar/kudesigner_lib/plugin.h
index ce912275d..0b074d975 100644
--- a/kugar/kudesigner_lib/plugin.h
+++ b/kugar/kudesigner_lib/plugin.h
@@ -36,7 +36,7 @@ class KuDesignerPlugin: public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    KuDesignerPlugin( TQObject *tqparent, const char* name, const TQStringList& args );
+    KuDesignerPlugin( TQObject *parent, const char* name, const TQStringList& args );
     virtual ~KuDesignerPlugin();
     virtual bool acceptsDrops()
     {
diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp
index 945d3b71d..f7d2aed18 100644
--- a/kugar/kudesigner_lib/structurewidget.cpp
+++ b/kugar/kudesigner_lib/structurewidget.cpp
@@ -45,11 +45,11 @@ using namespace KoProperty;
 class StructureItem: public KListViewItem
 {
 public:
-    StructureItem( KListView *tqparent, const TQString &name )
-            : KListViewItem( tqparent, name ), m_bold( false )
+    StructureItem( KListView *parent, const TQString &name )
+            : KListViewItem( parent, name ), m_bold( false )
     {}
-    StructureItem( KListViewItem *tqparent, const TQString &name )
-            : KListViewItem( tqparent, name ), m_bold( false )
+    StructureItem( KListViewItem *parent, const TQString &name )
+            : KListViewItem( parent, name ), m_bold( false )
     {}
     void setBold( bool b )
     {
@@ -75,8 +75,8 @@ private:
     bool m_bold;
 };
 
-StructureWidget::StructureWidget( TQWidget* tqparent, const char* name )
-        : KListView( tqparent, name )
+StructureWidget::StructureWidget( TQWidget* parent, const char* name )
+        : KListView( parent, name )
 {
     setFullWidth( true );
     addColumn( tr( "Report Structure" ) );
diff --git a/kugar/kudesigner_lib/structurewidget.h b/kugar/kudesigner_lib/structurewidget.h
index 1bb3302fd..842b69861 100644
--- a/kugar/kudesigner_lib/structurewidget.h
+++ b/kugar/kudesigner_lib/structurewidget.h
@@ -39,7 +39,7 @@ class StructureWidget: public KListView
     Q_OBJECT
   TQ_OBJECT
 public:
-    StructureWidget( TQWidget* tqparent = 0, const char* name = 0 );
+    StructureWidget( TQWidget* parent = 0, const char* name = 0 );
 
 public slots:
     void refresh();
diff --git a/kugar/kudesigner_lib/view.cpp b/kugar/kudesigner_lib/view.cpp
index 70bf22caf..a7b3ca1ff 100644
--- a/kugar/kudesigner_lib/view.cpp
+++ b/kugar/kudesigner_lib/view.cpp
@@ -93,8 +93,8 @@ void SelectionRect::draw( TQPainter & painter )
 
 
 
-View::View( Canvas *canvas, TQWidget *tqparent, const char *name, WFlags f ) :
-        TQCanvasView( canvas, tqparent, name, f ), selectionBuf( 0 ), m_plugin( 0 ), m_canvas( canvas )
+View::View( Canvas *canvas, TQWidget *parent, const char *name, WFlags f ) :
+        TQCanvasView( canvas, parent, name, f ), selectionBuf( 0 ), m_plugin( 0 ), m_canvas( canvas )
 {
     itemToInsert = 0;
     moving = 0;
diff --git a/kugar/kudesigner_lib/view.h b/kugar/kudesigner_lib/view.h
index 5b4ebe403..9e71633fd 100644
--- a/kugar/kudesigner_lib/view.h
+++ b/kugar/kudesigner_lib/view.h
@@ -60,7 +60,7 @@ class View: public TQCanvasView
     Q_OBJECT
   TQ_OBJECT
 public:
-    View( Canvas *canvas, TQWidget *tqparent, const char *name = 0, WFlags f = 0 );
+    View( Canvas *canvas, TQWidget *parent, const char *name = 0, WFlags f = 0 );
 
     int itemToInsert;
 
diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp
index 6fb49220b..923323cb8 100644
--- a/kugar/lib/inputmask.cpp
+++ b/kugar/lib/inputmask.cpp
@@ -17,12 +17,12 @@
 namespace Kugar
 {
 
-InputMask::InputMask( TQObject *tqparent, const char *name )
-        : TQObject( tqparent, name ),
+InputMask::InputMask( TQObject *parent, const char *name )
+        : TQObject( parent, name ),
         m_text( TQString() ),
         m_maxLength( 32767 ),
         m_blank( ' ' ),
-        m_tqmask( TQString() ),
+        m_mask( TQString() ),
         m_maskData( 0L )
 {}
 
@@ -31,14 +31,14 @@ InputMask::~InputMask()
     delete [] m_maskData;
 }
 
-TQString InputMask::tqmask() const
+TQString InputMask::mask() const
 {
-    return ( m_maskData ? m_tqmask + ';' + m_blank : TQString() );
+    return ( m_maskData ? m_mask + ';' + m_blank : TQString() );
 }
 
-void InputMask::setMask( const TQString &tqmask )
+void InputMask::setMask( const TQString &mask )
 {
-    parseInputMask( tqmask );
+    parseInputMask( mask );
 }
 
 TQString InputMask::formatText( const TQString &txt )
@@ -59,7 +59,7 @@ void InputMask::parseInputMask( const TQString &maskFields )
         return ;
     }
 
-    m_tqmask = maskFields.section( ';', 0, 0 );
+    m_mask = maskFields.section( ';', 0, 0 );
     m_blank = maskFields.section( ';', 1, 1 ).at( 0 );
     if ( m_blank.isNull() )
         m_blank = ' ';
@@ -68,10 +68,10 @@ void InputMask::parseInputMask( const TQString &maskFields )
     m_maxLength = 0;
     TQChar c = 0;
     uint i;
-    for ( i = 0; i < m_tqmask.length(); i++ )
+    for ( i = 0; i < m_mask.length(); i++ )
     {
-        c = m_tqmask.at( i );
-        if ( i > 0 && m_tqmask.at( i - 1 ) == '\\' )
+        c = m_mask.at( i );
+        if ( i > 0 && m_mask.at( i - 1 ) == '\\' )
         {
             m_maxLength++;
             continue;
@@ -91,9 +91,9 @@ void InputMask::parseInputMask( const TQString &maskFields )
     bool s;
     bool escape = FALSE;
     int index = 0;
-    for ( i = 0; i < m_tqmask.length(); i++ )
+    for ( i = 0; i < m_mask.length(); i++ )
     {
-        c = m_tqmask.at( i );
+        c = m_mask.at( i );
         if ( escape )
         {
             s = TRUE;
@@ -153,9 +153,9 @@ void InputMask::parseInputMask( const TQString &maskFields )
     }
 }
 
-bool InputMask::isValidInput( TQChar key, TQChar tqmask ) const
+bool InputMask::isValidInput( TQChar key, TQChar mask ) const
 {
-    switch ( tqmask )
+    switch ( mask )
     {
     case 'A':
         if ( key.isLetter() && key != m_blank )
diff --git a/kugar/lib/inputmask.h b/kugar/lib/inputmask.h
index 93889a162..f1f0886fd 100644
--- a/kugar/lib/inputmask.h
+++ b/kugar/lib/inputmask.h
@@ -25,18 +25,18 @@ class InputMask : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    InputMask( TQObject *tqparent = 0, const char *name = 0 );
+    InputMask( TQObject *parent = 0, const char *name = 0 );
 
     ~InputMask();
 
-    TQString tqmask() const;
-    void setMask( const TQString &tqmask );
+    TQString mask() const;
+    void setMask( const TQString &mask );
 
     TQString formatText( const TQString &txt );
 
 private:
     void parseInputMask( const TQString &maskFields );
-    bool isValidInput( TQChar key, TQChar tqmask ) const;
+    bool isValidInput( TQChar key, TQChar mask ) const;
     TQString maskString( uint pos, const TQString &str, bool clear = FALSE ) const;
     TQString clearString( uint pos, uint len ) const;
     TQString stripString( const TQString &str ) const;
@@ -46,11 +46,11 @@ private:
     TQString m_text;
     int m_maxLength;
     TQChar m_blank;
-    TQString m_tqmask;
+    TQString m_mask;
     struct MaskInputData
     {
         enum Casemode { NoCaseMode, Upper, Lower };
-        TQChar maskChar; // either the separator char or the inputtqmask
+        TQChar maskChar; // either the separator char or the inputmask
         bool separator;
         Casemode caseMode;
     };
diff --git a/kugar/lib/mfieldobject.cpp b/kugar/lib/mfieldobject.cpp
index 7f7b994a7..3444d5b7f 100644
--- a/kugar/lib/mfieldobject.cpp
+++ b/kugar/lib/mfieldobject.cpp
@@ -140,7 +140,7 @@ void MFieldObject::setText( const TQString txt )
 
 TQString MFieldObject::getInputMask() const
 {
-    return m_inputMask->tqmask();
+    return m_inputMask->mask();
 }
 
 void MFieldObject::setInputMask( const TQString &inputMask )
diff --git a/kugar/lib/mfieldobject.h b/kugar/lib/mfieldobject.h
index d04fca39f..aa62a12f2 100644
--- a/kugar/lib/mfieldobject.h
+++ b/kugar/lib/mfieldobject.h
@@ -55,7 +55,7 @@ protected:
     TQColor saveColor;
     /** Field's comma flag */
     int comma;
-    /** Input tqmask */
+    /** Input mask */
     TQString inputMask;
 
 public:
diff --git a/kugar/lib/mpagecollection.cpp b/kugar/lib/mpagecollection.cpp
index 226186560..60aa0f5ec 100644
--- a/kugar/lib/mpagecollection.cpp
+++ b/kugar/lib/mpagecollection.cpp
@@ -15,7 +15,7 @@ namespace Kugar
 {
 
 /** Constructor */
-MPageCollection::MPageCollection( TQObject *tqparent ) : TQObject( tqparent )
+MPageCollection::MPageCollection( TQObject *parent ) : TQObject( parent )
 {
     // Set page list to AutoDelete
     pages.setAutoDelete( true );
diff --git a/kugar/lib/mpagecollection.h b/kugar/lib/mpagecollection.h
index c4b78cee1..a5de1e66d 100644
--- a/kugar/lib/mpagecollection.h
+++ b/kugar/lib/mpagecollection.h
@@ -26,7 +26,7 @@ class MPageCollection : public TQObject
 
 public:
     /** Constructor */
-    MPageCollection( TQObject *tqparent );
+    MPageCollection( TQObject *parent );
     /** Copy constructor */
     MPageCollection( const MPageCollection& mPageCollection );
     /** Assignment operator */
diff --git a/kugar/lib/mpagedisplay.cpp b/kugar/lib/mpagedisplay.cpp
index 75ff29991..12eac741e 100644
--- a/kugar/lib/mpagedisplay.cpp
+++ b/kugar/lib/mpagedisplay.cpp
@@ -12,7 +12,7 @@ namespace Kugar
 {
 
 /** Constructor */
-MPageDisplay::MPageDisplay( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name )
+MPageDisplay::MPageDisplay( TQWidget *parent, const char *name ) : TQWidget( parent, name )
 {
     buffer.resize( 1, 1 );
 }
diff --git a/kugar/lib/mpagedisplay.h b/kugar/lib/mpagedisplay.h
index db4f7f74b..65a419d57 100644
--- a/kugar/lib/mpagedisplay.h
+++ b/kugar/lib/mpagedisplay.h
@@ -28,7 +28,7 @@ class MPageDisplay : public TQWidget
   TQ_OBJECT
 public:
     /** Constructor */
-    MPageDisplay( TQWidget *tqparent = 0, const char *name = 0 );
+    MPageDisplay( TQWidget *parent = 0, const char *name = 0 );
     /** Destructor */
     virtual ~MPageDisplay();
 
diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp
index c0e916568..a3fd9ab5d 100644
--- a/kugar/lib/mreportviewer.cpp
+++ b/kugar/lib/mreportviewer.cpp
@@ -19,14 +19,14 @@ namespace Kugar
 {
 
 /** Constructor */
-MReportViewer::MReportViewer( MReportEngine *engine, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), progress( 0 )
+MReportViewer::MReportViewer( MReportEngine *engine, TQWidget *parent, const char *name ) : TQWidget( parent, name ), progress( 0 )
 {
     rptEngine = engine;
     rptEngine->addRef();
     init();
 }
 
-MReportViewer::MReportViewer( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), progress( 0 )
+MReportViewer::MReportViewer( TQWidget *parent, const char *name ) : TQWidget( parent, name ), progress( 0 )
 {
     // Create the scrollview
     rptEngine = new MReportEngine();
diff --git a/kugar/lib/mreportviewer.h b/kugar/lib/mreportviewer.h
index 4927f28dc..599e22dbf 100644
--- a/kugar/lib/mreportviewer.h
+++ b/kugar/lib/mreportviewer.h
@@ -44,8 +44,8 @@ class KUGAR_EXPORT MReportViewer : public TQWidget
   TQ_OBJECT
 
 public:
-    MReportViewer( TQWidget *tqparent = 0, const char *name = 0 );
-    MReportViewer( MReportEngine* engine, TQWidget *tqparent = 0, const char *name = 0 );
+    MReportViewer( TQWidget *parent = 0, const char *name = 0 );
+    MReportViewer( MReportEngine* engine, TQWidget *parent = 0, const char *name = 0 );
     virtual ~MReportViewer();
 
     bool setReportData( const TQString & );
diff --git a/kugar/part/kugar_factory.cpp b/kugar/part/kugar_factory.cpp
index cc7631e37..f0206802c 100644
--- a/kugar/part/kugar_factory.cpp
+++ b/kugar/part/kugar_factory.cpp
@@ -29,7 +29,7 @@ K_EXPORT_COMPONENT_FACTORY( libkugarpart, KugarFactory )
 
 // The factory ctor.
 
-KugarFactory::KugarFactory( TQObject *tqparent, const char* name ) : KoFactory( tqparent, name )
+KugarFactory::KugarFactory( TQObject *parent, const char* name ) : KoFactory( parent, name )
 {
     global();
 }
@@ -66,7 +66,7 @@ KAboutData *KugarFactory::aboutData()
 // Create a new part.
 
 KParts::Part* KugarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
-        TQObject* tqparent, const char* name, const char* classname, const TQStringList & data )
+        TQObject* parent, const char* name, const char* classname, const TQStringList & data )
 {
     TQString forcedUserTemplate;
     for ( TQStringList::const_iterator it = data.begin();it != data.end();++it )
@@ -78,7 +78,7 @@ KParts::Part* KugarFactory::createPartObject( TQWidget *parentWidget, const char
 
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
     // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    KugarPart *part = new KugarPart( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    KugarPart *part = new KugarPart( parentWidget, widgetName, parent, name, !bWantKoDocument );
 
     //  if ( !bWantKoDocument )
     part->setReadWrite( false );
diff --git a/kugar/part/kugar_factory.h b/kugar/part/kugar_factory.h
index 390b21df6..7b313aa73 100644
--- a/kugar/part/kugar_factory.h
+++ b/kugar/part/kugar_factory.h
@@ -18,11 +18,11 @@ class KugarFactory : public KoFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    KugarFactory( TQObject* tqparent = 0, const char* name = 0 );
+    KugarFactory( TQObject* parent = 0, const char* name = 0 );
     ~KugarFactory();
 
     virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0,
-                                            TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument",
+                                            TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument",
                                             const TQStringList &args = TQStringList() );
 
     static KInstance* global();
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index c82495057..38ac5257e 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -31,8 +31,8 @@
 #include <KoFilterManager.h>
 
 KugarPart::KugarPart( TQWidget *parentWidget, const char *widgetName, 
-                      TQObject* tqparent, const char* name, bool singleViewMode ) 
-    : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ),
+                      TQObject* parent, const char* name, bool singleViewMode ) 
+    : KoDocument( parentWidget, widgetName, parent, name, singleViewMode ),
     m_templateOk( false )
 {
     setInstance( KugarFactory::global(), false );
@@ -138,9 +138,9 @@ bool KugarPart::initDoc( InitDocFlags /*flags*/, TQWidget* /*parentWidget*/ )
     return TRUE;
 }
 
-KoView* KugarPart::createViewInstance( TQWidget* tqparent, const char* name )
+KoView* KugarPart::createViewInstance( TQWidget* parent, const char* name )
 {
-    KugarView * v = new KugarView( this, tqparent, name );
+    KugarView * v = new KugarView( this, parent, name );
     if ( m_templateOk )
         v->renderReport();
     return v;
diff --git a/kugar/part/kugar_part.h b/kugar/part/kugar_part.h
index e489ceb09..31e25355c 100644
--- a/kugar/part/kugar_part.h
+++ b/kugar/part/kugar_part.h
@@ -21,7 +21,7 @@ class KugarPart: public KoDocument
 
 public:
     KugarPart( TQWidget *parentWidget = 0, const char *widgetName = 0, 
-               TQObject* tqparent = 0,
+               TQObject* parent = 0,
                const char* name = 0, bool singleViewMode = false );
     virtual ~KugarPart();
 
@@ -47,7 +47,7 @@ public:
     }
 
 protected:
-    virtual KoView* createViewInstance( TQWidget* tqparent, const char* name );
+    virtual KoView* createViewInstance( TQWidget* parent, const char* name );
 
 public slots:
     void setForcedUserTemplate( const TQString &/*name*/ )
diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp
index 28f0d871a..ddd8dfe1c 100644
--- a/kugar/part/kugar_view.cpp
+++ b/kugar/part/kugar_view.cpp
@@ -28,8 +28,8 @@
 
 // The view ctor.
 
-KugarView::KugarView( KugarPart *part, TQWidget *tqparent, const char *name )
-        : KoView( part, tqparent, name )
+KugarView::KugarView( KugarPart *part, TQWidget *parent, const char *name )
+        : KoView( part, parent, name )
 {
     setInstance( KugarFactory::global() );
 
diff --git a/kugar/part/kugar_view.h b/kugar/part/kugar_view.h
index b29ea6244..6507f74a7 100644
--- a/kugar/part/kugar_view.h
+++ b/kugar/part/kugar_view.h
@@ -18,7 +18,7 @@ class KugarView: public KoView
   TQ_OBJECT
 
 public:
-    KugarView( KugarPart *part, TQWidget *tqparent, const char *name );
+    KugarView( KugarPart *part, TQWidget *parent, const char *name );
     virtual ~KugarView();
 
     void setForcedUserTemplate( const TQString &name );
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp
index 045755145..65aa9e14d 100644
--- a/kword/KWCanvas.cpp
+++ b/kword/KWCanvas.cpp
@@ -63,8 +63,8 @@
 
 #include <assert.h>
 
-KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *tqparent, KWDocument *d, KWGUI *lGui)
-    : TQScrollView( tqparent, "canvas", /*WNorthWestGravity*/ WStaticContents| WResizeNoErase | WRepaintNoErase ), m_doc( d )
+KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KWGUI *lGui)
+    : TQScrollView( parent, "canvas", /*WNorthWestGravity*/ WStaticContents| WResizeNoErase | WRepaintNoErase ), m_doc( d )
 {
     m_frameViewManager = new KWFrameViewManager(d);
     m_gui = lGui;
@@ -2039,9 +2039,9 @@ KoPoint KWCanvas::caretPos()
 
 
 // ************** InteractionPolicy ***********************
-InteractionPolicy::InteractionPolicy(KWCanvas *tqparent, bool doInit, bool includeInlineFrames) {
+InteractionPolicy::InteractionPolicy(KWCanvas *parent, bool doInit, bool includeInlineFrames) {
     m_gotDragEvents = false;
-    m_parent = tqparent;
+    m_parent = parent;
     if(doInit) {
         TQValueList<KWFrameView*> selectedFrames = m_parent->frameViewManager()->selectedFrames();
         TQValueListIterator<KWFrameView*> framesIterator = selectedFrames.begin();
@@ -2061,7 +2061,7 @@ InteractionPolicy::InteractionPolicy(KWCanvas *tqparent, bool doInit, bool inclu
     }
 }
 
-InteractionPolicy* InteractionPolicy::createPolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState) {
+InteractionPolicy* InteractionPolicy::createPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState) {
     if(buttonState & Qt::LeftButton || buttonState & Qt::RightButton) {
         // little inner class to make sure we don't duplicate code
         class Selector {
@@ -2085,11 +2085,11 @@ InteractionPolicy* InteractionPolicy::createPolicy(KWCanvas *tqparent, MouseMean
             bool m_leftClick, m_doSomething;
         };
 
-        Selector selector(tqparent, point, buttonState, keyState);
+        Selector selector(parent, point, buttonState, keyState);
         switch(meaning) {
             case MEANING_MOUSE_MOVE:
                 selector.doSelect();
-                return new FrameMovePolicy(tqparent, point);
+                return new FrameMovePolicy(parent, point);
             case MEANING_TOPLEFT:
             case MEANING_TOP:
             case MEANING_TOPRIGHT:
@@ -2099,9 +2099,9 @@ InteractionPolicy* InteractionPolicy::createPolicy(KWCanvas *tqparent, MouseMean
             case MEANING_BOTTOMLEFT:
             case MEANING_LEFT:
                 selector.doSelect();
-                return new FrameResizePolicy(tqparent, meaning, point);
+                return new FrameResizePolicy(parent, meaning, point);
             default:
-                FrameSelectPolicy *fsp = new FrameSelectPolicy(tqparent, meaning, point, buttonState, keyState);
+                FrameSelectPolicy *fsp = new FrameSelectPolicy(parent, meaning, point, buttonState, keyState);
                 if(fsp->isValid())
                     return fsp;
                 delete fsp;
@@ -2120,8 +2120,8 @@ void InteractionPolicy::cancelInteraction() {
 
 
 // ************** FrameResizePolicy ***********************
-FrameResizePolicy::FrameResizePolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point) :
-    InteractionPolicy (tqparent, true, true), m_boundingRect() {
+FrameResizePolicy::FrameResizePolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point) :
+    InteractionPolicy (parent, true, true), m_boundingRect() {
 
     if( meaning == MEANING_TOPLEFT) {
         m_top = true; m_bottom = false; m_left = true; m_right = false;
@@ -2308,8 +2308,8 @@ void FrameResizePolicy::finishInteraction() {
 
 
 // *************** FrameMovePolicy ************************
-FrameMovePolicy::FrameMovePolicy(KWCanvas *tqparent, KoPoint &point) :
-    InteractionPolicy (tqparent), m_boundingRect() {
+FrameMovePolicy::FrameMovePolicy(KWCanvas *parent, KoPoint &point) :
+    InteractionPolicy (parent), m_boundingRect() {
 
     TQValueListConstIterator<KWFrame*> framesIterator = m_frames.begin();
     for(;framesIterator != m_frames.end(); ++framesIterator) {
@@ -2442,15 +2442,15 @@ void FrameMovePolicy::finishInteraction() {
 
 
 // ************** FrameSelectPolicy ***********************
-FrameSelectPolicy::FrameSelectPolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState)
-    : InteractionPolicy(tqparent, false) {
+FrameSelectPolicy::FrameSelectPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState)
+    : InteractionPolicy(parent, false) {
 
     bool leftButton = buttonState & Qt::LeftButton;
     // this is a special case; if a frame that is curently being edited is 'selected' on the border
     // we redirect that click to the text part of the frame.
     // this means we give the user a lot more space to click on the left side of the frame to
     // select the first characters.
-    KWFrameSetEdit *fse = tqparent->currentFrameSetEdit();
+    KWFrameSetEdit *fse = parent->currentFrameSetEdit();
     if(leftButton && fse) {
         KWFrameView *view = m_parent->frameViewManager()->view(point,
                 KWFrameViewManager::unselected, true);
@@ -2462,8 +2462,8 @@ FrameSelectPolicy::FrameSelectPolicy(KWCanvas *tqparent, MouseMeaning meaning, K
             point.setY(TQMIN(point.y(), view->frame()->bottom()));
 
             // convert point to the view coordinate system.
-            TQPoint normalPoint = tqparent->kWordDocument()->zoomPoint(point);
-            TQPoint mousePos = tqparent->viewMode()->normalToView(normalPoint);
+            TQPoint normalPoint = parent->kWordDocument()->zoomPoint(point);
+            TQPoint mousePos = parent->viewMode()->normalToView(normalPoint);
             TQMouseEvent *me = new TQMouseEvent(TQEvent::MouseButtonPress, mousePos,
                     buttonState, keyState);
             fse->mousePressEvent(me, normalPoint, point );
diff --git a/kword/KWCanvas.h b/kword/KWCanvas.h
index f7fffbbdd..955ea605f 100644
--- a/kword/KWCanvas.h
+++ b/kword/KWCanvas.h
@@ -63,7 +63,7 @@ class KWCanvas : public TQScrollView
   TQ_OBJECT
 
 public:
-    KWCanvas(const TQString& viewMode, TQWidget *tqparent, KWDocument *d, KWGUI *lGui);
+    KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KWGUI *lGui);
     virtual ~KWCanvas();
 
     KWDocument * kWordDocument() const { return m_doc; }
@@ -405,13 +405,13 @@ class InteractionPolicy {
 
         /**
          * This instanciates a new policy object and decides which policy is created based on the params.
-         * @param tqparent the tqparent canvas for things like redraw commands.
+         * @param parent the parent canvas for things like redraw commands.
          * @param meaning the mouseMeaning of as it is at 'point'
          * @param point the place where the mouseDown is registred.
          * @param buttonState which button is used to click, like Qt::LeftButton
          * @param keyState which keys are held down at the click, like TQt::ControlButton
          */
-        static InteractionPolicy* createPolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState);
+        static InteractionPolicy* createPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState);
 
         void hadDragEvents() { m_gotDragEvents = true; }
         bool gotDragEvents() { return m_gotDragEvents; }
@@ -419,11 +419,11 @@ class InteractionPolicy {
     protected:
         /**
          * Constructor.
-         * @param tqparent the tqparent canvas.
+         * @param parent the parent canvas.
          * @param doInit if true this will initialize the m_frames and m_indexFrame variables.
          * @param includeInlineFrames if true the m_frames will include inline frames
          */
-        InteractionPolicy(KWCanvas *tqparent, bool doInit = true, bool includeInlineFrames = false);
+        InteractionPolicy(KWCanvas *parent, bool doInit = true, bool includeInlineFrames = false);
 
         TQValueList<FrameIndex> m_indexFrame;
         KWCanvas *m_parent;
@@ -441,7 +441,7 @@ class InteractionPolicy {
  */
 class FrameResizePolicy : public InteractionPolicy {
     public:
-        FrameResizePolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point);
+        FrameResizePolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point);
         void handleMouseMove(TQt::ButtonState keyState, const KoPoint &point);
         KCommand *createCommand();
         void finishInteraction();
@@ -460,7 +460,7 @@ class FrameResizePolicy : public InteractionPolicy {
  */
 class FrameMovePolicy : public InteractionPolicy {
     public:
-        FrameMovePolicy(KWCanvas *tqparent, KoPoint &point);
+        FrameMovePolicy(KWCanvas *parent, KoPoint &point);
         void handleMouseMove(TQt::ButtonState keyState, const KoPoint &point);
         KCommand *createCommand();
         void finishInteraction();
@@ -476,7 +476,7 @@ class FrameMovePolicy : public InteractionPolicy {
  */
 class FrameSelectPolicy : public InteractionPolicy {
     public:
-        FrameSelectPolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState state, TQt::ButtonState keyState);
+        FrameSelectPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState state, TQt::ButtonState keyState);
         void handleMouseMove(TQt::ButtonState keyState, const KoPoint &point);
         KCommand *createCommand();
         void finishInteraction();
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index a8a3f6c7b..977ff3222 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -78,49 +78,49 @@ static inline TQPixmap loadIcon( const char * name ) {
     ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
 }
 
-KWConfig::KWConfig( KWView* tqparent )
+KWConfig::KWConfig( KWView* parent )
   : KDialogBase(KDialogBase::IconList,i18n("Configure KWord") ,
           KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel| KDialogBase::Default,
-          KDialogBase::Ok, tqparent)
+          KDialogBase::Ok, parent)
 
 {
   TQVBox *page2 = addVBoxPage( i18n("Interface"), i18n("Interface Settings"),
                               loadIcon("configure") );
-  m_interfacePage=new ConfigureInterfacePage(tqparent, page2);
+  m_interfacePage=new ConfigureInterfacePage(parent, page2);
 
   TQVBox *page4 = addVBoxPage( i18n("Document"), i18n("Document Settings"),
                               loadIcon("kword_kwd") );
 
-  m_defaultDocPage=new ConfigureDefaultDocPage(tqparent, page4);
+  m_defaultDocPage=new ConfigureDefaultDocPage(parent, page4);
 
   TQVBox *page = addVBoxPage( i18n("Spelling"), i18n("Spell Checker Behavior"),
                         loadIcon("spellcheck") );
-  m_spellPage = new ConfigureSpellPage(tqparent, page);
+  m_spellPage = new ConfigureSpellPage(parent, page);
 
   TQVBox *page5 = addVBoxPage( i18n("Formula"), i18n("Formula Defaults"),
                               loadIcon("kformula") );
-  m_formulaPage=new KFormula::ConfigurePage( tqparent->kWordDocument()->formulaDocument( false ),
+  m_formulaPage=new KFormula::ConfigurePage( parent->kWordDocument()->formulaDocument( false ),
                                              this, KWFactory::instance()->config(), page5 );
 
   TQVBox *page3 = addVBoxPage( i18n("Misc"), i18n("Misc Settings"),
                               loadIcon("misc") );
-  m_miscPage=new ConfigureMiscPage(tqparent, page3);
+  m_miscPage=new ConfigureMiscPage(parent, page3);
 
   TQVBox *page6 = addVBoxPage( i18n("Path"), i18n("Path Settings"),
                               loadIcon("path") );
-  m_pathPage=new ConfigurePathPage(tqparent, page6);
+  m_pathPage=new ConfigurePathPage(parent, page6);
 
   if (KoSpeaker::isKttsdInstalled()) {
       TQVBox *page7 = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"),
           i18n("Text-to-Speech Settings"), loadIcon("access") );
-      m_ttsPage=new ConfigureTTSPage(tqparent, page7);
+      m_ttsPage=new ConfigureTTSPage(parent, page7);
   } else m_ttsPage = 0;
 
-  m_doc = tqparent->kWordDocument();
+  m_doc = parent->kWordDocument();
   connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply()));
 
   connect( m_interfacePage, TQT_SIGNAL( unitChanged( int ) ), TQT_SLOT( unitChanged( int ) ) );
-  unitChanged( tqparent->kWordDocument()->unit() );
+  unitChanged( parent->kWordDocument()->unit() );
 }
 
 void KWConfig::unitChanged( int u )
@@ -211,7 +211,7 @@ void KWConfig::slotDefault()
 ////
 
 ConfigureSpellPage::ConfigureSpellPage( KWView *view, TQVBox *box, char *name )
-    : TQObject( box->tqparent(), name )
+    : TQObject( box->parent(), name )
 {
     m_pView=view;
     config = KWFactory::instance()->config();
@@ -239,7 +239,7 @@ void ConfigureSpellPage::slotDefault()
 }
 
 ConfigureInterfacePage::ConfigureInterfacePage( KWView *view, TQVBox *box, char *name )
- : TQObject( box->tqparent(), name )
+ : TQObject( box->parent(), name )
 {
     m_pView=view;
     config = KWFactory::instance()->config();
@@ -481,7 +481,7 @@ void ConfigureInterfacePage::slotDefault()
 ////
 
 ConfigureMiscPage::ConfigureMiscPage( KWView *view, TQVBox *box, char *name )
- : TQObject( box->tqparent(), name )
+ : TQObject( box->parent(), name )
 {
     m_pView=view;
     config = KWFactory::instance()->config();
@@ -681,7 +681,7 @@ void ConfigureMiscPage::setUnit( KoUnit::Unit )
 ////
 
 ConfigureDefaultDocPage::ConfigureDefaultDocPage( KWView *view, TQVBox *box, char *name )
- : TQObject( box->tqparent(), name )
+ : TQObject( box->parent(), name )
 {
     m_pView=view;
     KWDocument * doc = m_pView->kWordDocument();
@@ -918,7 +918,7 @@ void ConfigureDefaultDocPage::slotDefault()
 void ConfigureDefaultDocPage::selectNewDefaultFont() {
     TQStringList list;
     KFontChooser::getFontList(list, KFontChooser::SmoothScalableFonts);
-    KFontDialog dlg( (TQWidget *)this->tqparent(), "Font Selector", false, true, list, true );
+    KFontDialog dlg( (TQWidget *)this->parent(), "Font Selector", false, true, list, true );
     dlg.setFont(*font);
     int result = dlg.exec();
     if (KDialog::Accepted == result) {
@@ -940,7 +940,7 @@ void ConfigureDefaultDocPage::setUnit( KoUnit::Unit unit )
 ////
 
 ConfigurePathPage::ConfigurePathPage( KWView *view, TQVBox *box, char *name )
- : TQObject( box->tqparent(), name )
+ : TQObject( box->parent(), name )
 {
     m_pView=view;
     KWDocument * doc = m_pView->kWordDocument();
@@ -1030,7 +1030,7 @@ void ConfigurePathPage::apply()
 ////
 
 ConfigureTTSPage::ConfigureTTSPage( KWView *view, TQVBox *box, char *name )
- : TQObject( box->tqparent(), name )
+ : TQObject( box->parent(), name )
 {
     Q_UNUSED(view);
     // m_pView=_view;
diff --git a/kword/KWConfig.h b/kword/KWConfig.h
index afe41b743..c8ea4d87b 100644
--- a/kword/KWConfig.h
+++ b/kword/KWConfig.h
@@ -188,7 +188,7 @@ class KWConfig : public KDialogBase
   TQ_OBJECT
 public:
     enum { KW_KSPELL=1,KP_INTERFACE=2,KP_MISC=4, KP_DOCUMENT=8, KP_FORMULA=16, KP_PATH = 32};
-    KWConfig( KWView* tqparent );
+    KWConfig( KWView* parent );
     void openPage(int flags);
 public slots:
     void slotApply();
diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp
index fac2ced04..8cfa8975a 100644
--- a/kword/KWConfigFootNoteDia.cpp
+++ b/kword/KWConfigFootNoteDia.cpp
@@ -39,8 +39,8 @@
 #include <tqcombobox.h>
 
 
-KWConfigFootNoteDia::KWConfigFootNoteDia( TQWidget *tqparent, const char *name, KWDocument *doc )
-    : KDialogBase(Tabbed, TQString(), Ok | Cancel , Ok, tqparent, name, true)
+KWConfigFootNoteDia::KWConfigFootNoteDia( TQWidget *parent, const char *name, KWDocument *doc )
+    : KDialogBase(Tabbed, TQString(), Ok | Cancel , Ok, parent, name, true)
 {
     setCaption( i18n("Configure Endnote/Footnote") );
     m_doc = doc;
diff --git a/kword/KWConfigFootNoteDia.h b/kword/KWConfigFootNoteDia.h
index 1b08765b8..757be1ddf 100644
--- a/kword/KWConfigFootNoteDia.h
+++ b/kword/KWConfigFootNoteDia.h
@@ -35,7 +35,7 @@ class KWConfigFootNoteDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWConfigFootNoteDia( TQWidget *tqparent, const char *name, KWDocument *doc );
+    KWConfigFootNoteDia( TQWidget *parent, const char *name, KWDocument *doc );
 protected:
     void setupTab1();
     void setupTab2();
diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp
index 6c124b6af..131192e9b 100644
--- a/kword/KWCreateBookmarkDia.cpp
+++ b/kword/KWCreateBookmarkDia.cpp
@@ -31,16 +31,16 @@
 #include "KWFrame.h"
 #include "KWFrameSet.h"
 
-KWCreateBookmarkDia::KWCreateBookmarkDia( const TQStringList & _list, TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
+KWCreateBookmarkDia::KWCreateBookmarkDia( const TQStringList & _list, TQWidget *parent, const char *name )
+    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
 {
     setCaption( i18n("Create New Bookmark") );
     listBookMark = _list;
     init();
 }
 
-KWCreateBookmarkDia::KWCreateBookmarkDia( const TQStringList & _list, const TQString & _name, TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
+KWCreateBookmarkDia::KWCreateBookmarkDia( const TQStringList & _list, const TQString & _name, TQWidget *parent, const char *name )
+    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
 {
     setCaption( i18n("Rename Bookmark") );
     listBookMark = _list;
@@ -80,8 +80,8 @@ void KWCreateBookmarkDia::nameChanged( const TQString &text)
 
 
 /* ****************************  */
-KWSelectBookmarkDia::KWSelectBookmarkDia( const TQStringList & _list, KWDocument *_doc, TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
+KWSelectBookmarkDia::KWSelectBookmarkDia( const TQStringList & _list, KWDocument *_doc, TQWidget *parent, const char *name )
+    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
 {
     m_doc=_doc;
     setCaption( i18n("Select Bookmark") );
diff --git a/kword/KWCreateBookmarkDia.h b/kword/KWCreateBookmarkDia.h
index a18d1aca4..fd4354d36 100644
--- a/kword/KWCreateBookmarkDia.h
+++ b/kword/KWCreateBookmarkDia.h
@@ -32,8 +32,8 @@ class KWCreateBookmarkDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWCreateBookmarkDia( const TQStringList & _list, TQWidget *tqparent, const char *name );
-    KWCreateBookmarkDia( const TQStringList & _list, const TQString & _name, TQWidget *tqparent, const char *name );
+    KWCreateBookmarkDia( const TQStringList & _list, TQWidget *parent, const char *name );
+    KWCreateBookmarkDia( const TQStringList & _list, const TQString & _name, TQWidget *parent, const char *name );
     TQString bookmarkName()const;
 
 protected slots:
@@ -51,7 +51,7 @@ class KWSelectBookmarkDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWSelectBookmarkDia( const TQStringList & _list, KWDocument *_doc, TQWidget *tqparent, const char *name );
+    KWSelectBookmarkDia( const TQStringList & _list, KWDocument *_doc, TQWidget *parent, const char *name );
     TQString bookmarkSelected()const;
 protected slots:
     void slotSelectionChanged();
diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp
index cb64b61b1..12f7b3b59 100644
--- a/kword/KWDeleteDia.cpp
+++ b/kword/KWDeleteDia.cpp
@@ -26,14 +26,14 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-KWDeleteDia::KWDeleteDia( KWView *tqparent, KWTableFrameSet *table, DeleteType type, TQValueList<uint> remove)
-    : KDialogBase( Plain, (type==deleteRow?i18n("Delete Row") : i18n("Delete Column")), Ok | Cancel, Ok, tqparent, "Delete Table items dialog", true )
+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 )
 {
     Q_ASSERT(type == deleteRow || type == deleteColumn);
     m_type = type;
     m_table = table;
     m_toRemove = remove;
-    m_view = tqparent;
+    m_view = parent;
 
     setupTab1();
     setButtonOK( KGuiItem(
diff --git a/kword/KWDeleteDia.h b/kword/KWDeleteDia.h
index e2ce9ff41..b2a1e2264 100644
--- a/kword/KWDeleteDia.h
+++ b/kword/KWDeleteDia.h
@@ -40,13 +40,13 @@ public:
 
     /**
      * Constructor for the ok-to-delete dialog.
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param name the internal name for the widget
      * @param table the table the rows or columns are to be deleted from
      * @param type the type of dialog this should become, either deleteRow or deleteColumn
      * @param remove a list of all the rows or columns that should be deleted.
      */
-    KWDeleteDia( KWView *tqparent, KWTableFrameSet *table, DeleteType type, TQValueList<uint> remove);
+    KWDeleteDia( KWView *parent, KWTableFrameSet *table, DeleteType type, TQValueList<uint> remove);
 
 protected:
     void setupTab1();
diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp
index 1aa56d5ef..5fe52cf6a 100644
--- a/kword/KWDocStruct.cpp
+++ b/kword/KWDocStruct.cpp
@@ -74,18 +74,18 @@ bool KWOrderedFrameSet::operator<( KWOrderedFrameSet ofs )
 /* Class: KWDocDocListViewItem                                    */
 /******************************************************************/
 
-KWDocListViewItem::KWDocListViewItem(TQListViewItem* tqparent, const TQString& text)
-    : KListViewItem(tqparent, text)
+KWDocListViewItem::KWDocListViewItem(TQListViewItem* parent, const TQString& text)
+    : KListViewItem(parent, text)
 {
 }
 
-KWDocListViewItem::KWDocListViewItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text )
-    :KListViewItem(tqparent, after, text)
+KWDocListViewItem::KWDocListViewItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text )
+    :KListViewItem(parent, after, text)
 {
 }
 
-KWDocListViewItem::KWDocListViewItem(TQListView* tqparent, const TQString& text)
-    :KListViewItem(tqparent, text)
+KWDocListViewItem::KWDocListViewItem(TQListView* parent, const TQString& text)
+    :KListViewItem(parent, text)
 {
 }
 
@@ -120,14 +120,14 @@ KWGUI* KWDocListViewItem::gui()
 /* Class: KWDocStructParagItem                                    */
 /******************************************************************/
 
-KWDocStructParagItem::KWDocStructParagItem(TQListViewItem* tqparent, const TQString& text, KWTextParag* parag )
-    : KWDocListViewItem(tqparent, text), m_parag(parag)
+KWDocStructParagItem::KWDocStructParagItem(TQListViewItem* parent, const TQString& text, KWTextParag* parag )
+    : KWDocListViewItem(parent, text), m_parag(parag)
 {
 }
 
-KWDocStructParagItem::KWDocStructParagItem(TQListViewItem* tqparent, TQListViewItem* after,
+KWDocStructParagItem::KWDocStructParagItem(TQListViewItem* parent, TQListViewItem* after,
     const TQString& text, KWTextParag* parag )
-    : KWDocListViewItem(tqparent, after, text), m_parag(parag)
+    : KWDocListViewItem(parent, after, text), m_parag(parag)
 {
 }
 
@@ -185,15 +185,15 @@ void KWDocStructParagItem::speakItem()
 /* Class: KWDocStructTextFrameItem                                */
 /******************************************************************/
 
-KWDocStructTextFrameItem::KWDocStructTextFrameItem(TQListViewItem* tqparent, const TQString& text,
+KWDocStructTextFrameItem::KWDocStructTextFrameItem(TQListViewItem* parent, const TQString& text,
     KWTextFrameSet* frameset, KWFrame* frame)
-    : KWDocListViewItem(tqparent, text), m_frame(frame), m_frameset(frameset)
+    : KWDocListViewItem(parent, text), m_frame(frame), m_frameset(frameset)
 {
 }
 
-KWDocStructTextFrameItem::KWDocStructTextFrameItem(TQListViewItem* tqparent, TQListViewItem* after, 
+KWDocStructTextFrameItem::KWDocStructTextFrameItem(TQListViewItem* parent, TQListViewItem* after, 
     const TQString& text, KWTextFrameSet* frameset, KWFrame* frame)
-    : KWDocListViewItem(tqparent, after, text), m_frame(frame), m_frameset(frameset)
+    : KWDocListViewItem(parent, after, text), m_frame(frame), m_frameset(frameset)
 {
 }
 
@@ -345,15 +345,15 @@ KWDocStructParagItem* KWDocStructTextFrameItem::findTextParagItem(const KWTextPa
 /* Class: KWDocStructTextFrameSetItem                             */
 /******************************************************************/
 
-KWDocStructTextFrameSetItem::KWDocStructTextFrameSetItem(TQListViewItem* tqparent, const TQString& text,
+KWDocStructTextFrameSetItem::KWDocStructTextFrameSetItem(TQListViewItem* parent, const TQString& text,
     KWTextFrameSet* frameset)
-    : KWDocListViewItem(tqparent, text ), m_frameset(frameset)
+    : KWDocListViewItem(parent, text ), m_frameset(frameset)
 {
 }
 
-KWDocStructTextFrameSetItem::KWDocStructTextFrameSetItem(TQListViewItem* tqparent, TQListViewItem* after,
+KWDocStructTextFrameSetItem::KWDocStructTextFrameSetItem(TQListViewItem* parent, TQListViewItem* after,
     const TQString& text, KWTextFrameSet* frameset)
-    : KWDocListViewItem(tqparent, after, text), m_frameset(frameset)
+    : KWDocListViewItem(parent, after, text), m_frameset(frameset)
 {
 }
 
@@ -382,7 +382,7 @@ void KWDocStructTextFrameSetItem::setupTextFrames()
     {
         KWFrame* frame = framePtrs.at(j);
         TQString name;
-        if ( KListViewItem::tqparent()->firstChild() == this && dok->processingType() == KWDocument::WP )
+        if ( KListViewItem::parent()->firstChild() == this && dok->processingType() == KWDocument::WP )
         {
             if ( dok->numColumns() == 1 )
                 name=i18n( "Page %1" ).tqarg(TQString::number(j + 1));
@@ -463,15 +463,15 @@ KWDocStructTextFrameItem* KWDocStructTextFrameSetItem::findTextFrameItem(const K
 /* Class: KWDocStructTableItem                                    */
 /******************************************************************/
 
-KWDocStructTableItem::KWDocStructTableItem(TQListViewItem* tqparent, const TQString& text,
+KWDocStructTableItem::KWDocStructTableItem(TQListViewItem* parent, const TQString& text,
     KWTableFrameSet* table)
-    :KWDocListViewItem(tqparent, text), m_table(table)
+    :KWDocListViewItem(parent, text), m_table(table)
 {
 }
 
-KWDocStructTableItem::KWDocStructTableItem(TQListViewItem* tqparent, TQListViewItem* after,
+KWDocStructTableItem::KWDocStructTableItem(TQListViewItem* parent, TQListViewItem* after,
     const TQString& text, KWTableFrameSet* table)
-    :KWDocListViewItem(tqparent, after, text), m_table(table)
+    :KWDocListViewItem(parent, after, text), m_table(table)
 {
 }
 
@@ -589,9 +589,9 @@ KWDocStructTextFrameItem* KWDocStructTableItem::findCellItem(const KWTextFrameSe
 /* Class: KWDocStructPictureItem                                  */
 /******************************************************************/
 
-KWDocStructPictureItem::KWDocStructPictureItem(TQListViewItem* tqparent, const TQString& text,
+KWDocStructPictureItem::KWDocStructPictureItem(TQListViewItem* parent, const TQString& text,
     KWPictureFrameSet* pic)
-    : KWDocListViewItem(tqparent, text), m_pic(pic)
+    : KWDocListViewItem(parent, text), m_pic(pic)
 {
 }
 
@@ -629,9 +629,9 @@ void KWDocStructPictureItem::editProperties()
 /* Class: KWDocStructFormulaItem                                  */
 /******************************************************************/
 
-KWDocStructFormulaItem::KWDocStructFormulaItem(TQListViewItem* tqparent, const TQString& text,
+KWDocStructFormulaItem::KWDocStructFormulaItem(TQListViewItem* parent, const TQString& text,
     KWFormulaFrameSet* form)
-    : KWDocListViewItem(tqparent, text), m_form(form)
+    : KWDocListViewItem(parent, text), m_form(form)
 {
 }
 
@@ -675,9 +675,9 @@ void KWDocStructFormulaItem::speakItem()
 /* Class: KWDocStructPartItem                                     */
 /******************************************************************/
 
-KWDocStructPartItem::KWDocStructPartItem(TQListViewItem* tqparent, const TQString& text,
+KWDocStructPartItem::KWDocStructPartItem(TQListViewItem* parent, const TQString& text,
     KWPartFrameSet* part)
-    : KWDocListViewItem(tqparent, text), m_part(part)
+    : KWDocListViewItem(parent, text), m_part(part)
 {
 }
 
@@ -715,9 +715,9 @@ void KWDocStructPartItem::editProperties()
 /* Class: KWDocStructRootItem                                     */
 /******************************************************************/
 
-KWDocStructRootItem::KWDocStructRootItem(TQListView* tqparent, const TQString& text,
+KWDocStructRootItem::KWDocStructRootItem(TQListView* parent, const TQString& text,
     TypeStructDocItem type )
-    : KWDocListViewItem(tqparent, text), m_type(type)
+    : KWDocListViewItem(parent, text), m_type(type)
 {
     switch ( type ) {
         case Arrangement: {
@@ -1046,8 +1046,8 @@ KWDocStructTableItem* KWDocStructRootItem::findTableItem(const KWFrameSet* frame
 /* Class: KWDocStructTree                                         */
 /******************************************************************/
 
-KWDocStructTree::KWDocStructTree(TQWidget* tqparent, KWDocument* doc, KWGUI* gui)
-    : KListView(tqparent), m_doc(doc), m_gui(gui)
+KWDocStructTree::KWDocStructTree(TQWidget* parent, KWDocument* doc, KWGUI* gui)
+    : KListView(parent), m_doc(doc), m_gui(gui)
 {
     embedded = new KWDocStructRootItem( this, i18n( "Embedded Objects" ), Embedded);
     formulafrms = new KWDocStructRootItem( this, i18n( "Formula Frames" ), FormulaFrames);
@@ -1188,8 +1188,8 @@ void KWDocStructTree::slotReturnPressed(TQListViewItem* i)
 /* Class: KWDocStruct                                             */
 /******************************************************************/
 
-KWDocStruct::KWDocStruct(TQWidget* tqparent, KWDocument* doc, KWGUI* gui)
-    : TQWidget(tqparent), m_doc(doc), m_gui(gui)
+KWDocStruct::KWDocStruct(TQWidget* parent, KWDocument* doc, KWGUI* gui)
+    : TQWidget(parent), m_doc(doc), m_gui(gui)
 {
     m_layout = new TQVBoxLayout( this );
 
diff --git a/kword/KWDocStruct.h b/kword/KWDocStruct.h
index 6d17eeb61..2eb4eb9d5 100644
--- a/kword/KWDocStruct.h
+++ b/kword/KWDocStruct.h
@@ -91,8 +91,8 @@ protected:
 class KWDocStructParagItem : public KWDocListViewItem
 {
 public:
-    KWDocStructParagItem(TQListViewItem* tqparent, const TQString& text, KWTextParag* parag);
-    KWDocStructParagItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text, KWTextParag* parag);
+    KWDocStructParagItem(TQListViewItem* parent, const TQString& text, KWTextParag* parag);
+    KWDocStructParagItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text, KWTextParag* parag);
     virtual ItemType itemType() { return IT_PARAG; }
     virtual void selectItem();
     virtual void editItem();
@@ -114,9 +114,9 @@ protected:
 class KWDocStructTextFrameItem : public KWDocListViewItem
 {
 public:
-    KWDocStructTextFrameItem(TQListViewItem* tqparent, const TQString& text,
+    KWDocStructTextFrameItem(TQListViewItem* parent, const TQString& text,
         KWTextFrameSet* frameset, KWFrame* frame );
-    KWDocStructTextFrameItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text,
+    KWDocStructTextFrameItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text,
         KWTextFrameSet* frameset, KWFrame* frame );
     virtual int ItemType() { return IT_TEXTFRAME; }
     virtual void selectItem();
@@ -144,8 +144,8 @@ protected:
 class KWDocStructTextFrameSetItem : public KWDocListViewItem
 {
 public:
-    KWDocStructTextFrameSetItem(TQListViewItem* tqparent, const TQString& text, KWTextFrameSet* frameset);
-    KWDocStructTextFrameSetItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text,
+    KWDocStructTextFrameSetItem(TQListViewItem* parent, const TQString& text, KWTextFrameSet* frameset);
+    KWDocStructTextFrameSetItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text,
         KWTextFrameSet* frameset );
     virtual int ItemType() { return IT_TEXT; }
     virtual void selectItem();
@@ -171,8 +171,8 @@ protected:
 class KWDocStructTableItem : public KWDocListViewItem
 {
 public:
-    KWDocStructTableItem(TQListViewItem* tqparent, const TQString& text, KWTableFrameSet* table );
-    KWDocStructTableItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text,
+    KWDocStructTableItem(TQListViewItem* parent, const TQString& text, KWTableFrameSet* table );
+    KWDocStructTableItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text,
         KWTableFrameSet* table );
     virtual int ItemType() { return IT_TABLE; }
     virtual void selectItem();
@@ -197,7 +197,7 @@ protected:
 class KWDocStructFormulaItem : public KWDocListViewItem
 {
 public:
-    KWDocStructFormulaItem(TQListViewItem* tqparent, const TQString& text, KWFormulaFrameSet* form);
+    KWDocStructFormulaItem(TQListViewItem* parent, const TQString& text, KWFormulaFrameSet* form);
     virtual int ItemType() { return IT_FORMULA; }
     virtual void selectItem();
     virtual void editItem();
@@ -218,7 +218,7 @@ protected:
 class KWDocStructPictureItem : public KWDocListViewItem
 {
 public:
-    KWDocStructPictureItem(TQListViewItem* tqparent, const TQString& text, KWPictureFrameSet* pic);
+    KWDocStructPictureItem(TQListViewItem* parent, const TQString& text, KWPictureFrameSet* pic);
     virtual int ItemType() { return IT_PICTURE; }
     virtual void selectItem();
     virtual void editItem();
@@ -237,7 +237,7 @@ protected:
 class KWDocStructPartItem : public KWDocListViewItem
 {
 public:
-    KWDocStructPartItem(TQListViewItem* tqparent, const TQString& text, KWPartFrameSet* part);
+    KWDocStructPartItem(TQListViewItem* parent, const TQString& text, KWPartFrameSet* part);
     virtual int ItemType() { return IT_PART; }
     virtual void selectItem();
     virtual void editItem();
@@ -256,7 +256,7 @@ protected:
 class KWDocStructRootItem : public KWDocListViewItem
 {
 public:
-    KWDocStructRootItem(TQListView* tqparent, const TQString& text, TypeStructDocItem type);
+    KWDocStructRootItem(TQListView* parent, const TQString& text, TypeStructDocItem type);
 
     virtual int ItemType() { return IT_ROOT; }
     void setupArrangement();
@@ -285,7 +285,7 @@ class KWDocStructTree : public KListView
   TQ_OBJECT
 
 public:
-    KWDocStructTree( TQWidget* tqparent, KWDocument* doc, KWGUI* gui );
+    KWDocStructTree( TQWidget* parent, KWDocument* doc, KWGUI* gui );
     ~KWDocStructTree();
 
     void setup();
@@ -325,7 +325,7 @@ class KWDocStruct : public TQWidget
   TQ_OBJECT
 
 public:
-    KWDocStruct( TQWidget* tqparent, KWDocument* doc, KWGUI* gui );
+    KWDocStruct( TQWidget* parent, KWDocument* doc, KWGUI* gui );
     void selectItem();
     void editItem();
     void deleteItem();
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index 5942c28b8..9420f0481 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -105,7 +105,7 @@ class KWCommandHistory : public KoCommandHistory
 {
 public:
     KWCommandHistory( KWDocument * doc ) : KoCommandHistory( doc->actionCollection(),  true ), m_pDoc( doc ) {}
-public /*slots*/: // They are already slots in the tqparent. Running tqmoc on the inherited class shouldn't be necessary AFAICS.
+public /*slots*/: // They are already slots in the parent. Running tqmoc on the inherited class shouldn't be necessary AFAICS.
     virtual void undo();
     virtual void redo();
 private:
@@ -151,8 +151,8 @@ public:
 
 const int KWDocument::CURRENT_SYNTAX_VERSION = 3;
 
-KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* tqparent, const char* name, bool singleViewMode )
-    : KoDocument( parentWidget, widname, tqparent, name, singleViewMode ),
+KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* parent, const char* name, bool singleViewMode )
+    : KoDocument( parentWidget, widname, parent, name, singleViewMode ),
       m_urlIntern()
 {
     KWStatisticVariable::setExtendedType(  true );
@@ -3011,12 +3011,12 @@ TQDragObject* KWDocument::dragSelected( const TQValueList<KWFrameView*> &selecte
     return dragSelectedPrivate(0, selectedFrames, 0);
 }
 // can't be const due to recalcVariables()
-TQDragObject* KWDocument::dragSelected( TQWidget *tqparent, KWTextFrameSet* fs) {
+TQDragObject* KWDocument::dragSelected( TQWidget *parent, KWTextFrameSet* fs) {
     TQValueList<KWFrameView*> noFrames;
-    return dragSelectedPrivate(tqparent, noFrames, fs);
+    return dragSelectedPrivate(parent, noFrames, fs);
 }
 // can't be const due to recalcVariables()
-TQDragObject* KWDocument::dragSelectedPrivate( TQWidget *tqparent, const TQValueList<KWFrameView*> &selectedFrames, KWTextFrameSet* fs)
+TQDragObject* KWDocument::dragSelectedPrivate( TQWidget *parent, const TQValueList<KWFrameView*> &selectedFrames, KWTextFrameSet* fs)
 {
     // We'll create a store (ZIP format) in memory
     TQBuffer buffer;
@@ -3039,7 +3039,7 @@ TQDragObject* KWDocument::dragSelectedPrivate( TQWidget *tqparent, const TQValue
 
     delete store;
 
-    KMultipleDrag* multiDrag = new KMultipleDrag( tqparent );
+    KMultipleDrag* multiDrag = new KMultipleDrag( parent );
     if ( !plainText.isEmpty() )
         multiDrag->addDragObject( new TQTextDrag( plainText, 0 ) );
     if ( !picture.isNull() )
@@ -3735,12 +3735,12 @@ void KWDocument::addShell( KoMainWindow *shell )
     KoDocument::addShell( shell );
 }
 
-KoView* KWDocument::createViewInstance( TQWidget* tqparent, const char* name )
+KoView* KWDocument::createViewInstance( TQWidget* parent, const char* name )
 {
     if ( isEmbedded() )
-        return new KWView( "ModeEmbedded", tqparent, name, this );
+        return new KWView( "ModeEmbedded", parent, name, this );
     else
-        return new KWView( m_viewModeType, tqparent, name, this );
+        return new KWView( m_viewModeType, parent, name, this );
 }
 
 // Paint this document when it's embedded
@@ -5431,15 +5431,15 @@ int KWDocument::lastPage() const {
     return pageManager()->lastPageNumber();
 }
 
-TQWidget* KWDocument::createCustomDocumentWidget(TQWidget *tqparent) {
+TQWidget* KWDocument::createCustomDocumentWidget(TQWidget *parent) {
     KoColumns columns;
     columns.columns = 1;
     columns.ptColumnSpacing = m_defaultColumnSpacing;
-    return new KWStartupWidget(tqparent, this, columns);
+    return new KWStartupWidget(parent, this, columns);
 }
 
-KWDocument::FramesChangedHandler::FramesChangedHandler(KWDocument *tqparent) {
-    m_parent = tqparent;
+KWDocument::FramesChangedHandler::FramesChangedHandler(KWDocument *parent) {
+    m_parent = parent;
     m_needLayout = false;
 }
 
diff --git a/kword/KWDocument.h b/kword/KWDocument.h
index 983b3add8..fcda863fa 100644
--- a/kword/KWDocument.h
+++ b/kword/KWDocument.h
@@ -131,7 +131,7 @@ public:
     friend class KWOasisLoader;
     friend class KWStartupWidget;
 
-    KWDocument( TQWidget *parentWidget = 0, const char *widname = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    KWDocument( TQWidget *parentWidget = 0, const char *widname = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false );
     ~KWDocument();
 
     enum ProcessingType {WP = 0, DTP = 1};
@@ -169,7 +169,7 @@ public:
     /**
      * Return a drag object with the selected text
      */
-    TQDragObject* dragSelected( TQWidget *tqparent, KWTextFrameSet* fs );
+    TQDragObject* dragSelected( TQWidget *parent, KWTextFrameSet* fs );
 
     virtual bool loadXML( TQIODevice *, const TQDomDocument & dom );
     virtual bool loadChildren( KoStore *store );
@@ -822,7 +822,7 @@ protected:
     /// fix up Z-order for import from older kword versions.
     void fixZOrders();
     TQString checkSectionTitleInParag( KoTextParag* parag, KWTextFrameSet*, int pageNum ) const;
-    KoView* createViewInstance( TQWidget* tqparent, const char* name );
+    KoView* createViewInstance( TQWidget* parent, const char* name );
 
     virtual bool completeLoading( KoStore* store );
     virtual bool completeSaving( KoStore *store );
@@ -846,7 +846,7 @@ protected:
     TQValueList<KoPictureKey> savePictureList();
 
     /// helper method for the 2 different dragSelected() versions
-    TQDragObject* dragSelectedPrivate( TQWidget *tqparent, const TQValueList<KWFrameView*> &selectedFrames, KWTextFrameSet* fs);
+    TQDragObject* dragSelectedPrivate( TQWidget *parent, const TQValueList<KWFrameView*> &selectedFrames, KWTextFrameSet* fs);
     /**
      * Save the whole document, or just the selection, into OASIS format
      * When saving the selection, also return the data as plain text and/or plain picture,
@@ -871,7 +871,7 @@ protected:
                              const TQValueList<KWFrameView*> &selectedFrames, TQString* plainText ) const;
 
     // inherited from KoDocument
-    TQWidget* createCustomDocumentWidget(TQWidget *tqparent);
+    TQWidget* createCustomDocumentWidget(TQWidget *parent);
 
 private:
     void clear();
@@ -879,7 +879,7 @@ private:
 
     class FramesChangedHandler {
         public:
-            FramesChangedHandler(KWDocument *tqparent);
+            FramesChangedHandler(KWDocument *parent);
             void addFrame(KWFrame*);
             void addFrameSet(KWFrameSet*);
             void execute();
diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp
index 3af07a3ef..3638301db 100644
--- a/kword/KWEditPersonnalExpression.cpp
+++ b/kword/KWEditPersonnalExpression.cpp
@@ -32,8 +32,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name , true, i18n("Edit Personal Expression"), Ok|Cancel, Ok, true )
+KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const char *name )
+    : KDialogBase( parent, name , true, i18n("Edit Personal Expression"), Ok|Cancel, Ok, true )
 {
     resize( 412, 339 );
     TQWidget *page = new TQWidget( this );
diff --git a/kword/KWEditPersonnalExpression.h b/kword/KWEditPersonnalExpression.h
index a408e4129..b7690431d 100644
--- a/kword/KWEditPersonnalExpression.h
+++ b/kword/KWEditPersonnalExpression.h
@@ -33,7 +33,7 @@ class KWEditPersonnalExpression : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWEditPersonnalExpression( TQWidget *tqparent, const char *name = 0 );
+    KWEditPersonnalExpression( TQWidget *parent, const char *name = 0 );
 
 protected:
     void init(const TQString& filename );
diff --git a/kword/KWFactory.cpp b/kword/KWFactory.cpp
index 31c3b5aaf..50648519a 100644
--- a/kword/KWFactory.cpp
+++ b/kword/KWFactory.cpp
@@ -28,8 +28,8 @@
 KInstance* KWFactory::s_instance = 0;
 KAboutData* KWFactory::s_aboutData = 0;
 
-KWFactory::KWFactory( TQObject* tqparent, const char* name )
-    : KoFactory( tqparent, name )
+KWFactory::KWFactory( TQObject* parent, const char* name )
+    : KoFactory( parent, name )
 {
   // Create our instance, so that it becomes KGlobal::instance if the
   // main app is KWord.
@@ -44,11 +44,11 @@ KWFactory::~KWFactory()
     s_instance=0L;
 }
 
-KParts::Part* KWFactory::createPartObject( TQWidget *parentWidget, const char *widname, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* KWFactory::createPartObject( TQWidget *parentWidget, const char *widname, TQObject* parent, const char* name, const char* classname, const TQStringList & )
 {
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    KWDocument *doc = new KWDocument( parentWidget, widname, tqparent, name, !bWantKoDocument );
+    KWDocument *doc = new KWDocument( parentWidget, widname, parent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
       doc->setReadWrite( false );
diff --git a/kword/KWFactory.h b/kword/KWFactory.h
index c9b735e7d..46803d3e4 100644
--- a/kword/KWFactory.h
+++ b/kword/KWFactory.h
@@ -29,10 +29,10 @@ class KWFactory : public KoFactory
     Q_OBJECT
     TQ_OBJECT
 public:
-    KWFactory( TQObject* tqparent = 0, const char* name = 0 );
+    KWFactory( TQObject* parent = 0, const char* name = 0 );
     ~KWFactory();
 
-    virtual KParts::Part* createPartObject( TQWidget * = 0, const char * = 0, TQObject* tqparent = 0, const char* name = 0, const char* classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part* createPartObject( TQWidget * = 0, const char * = 0, TQObject* parent = 0, const char* name = 0, const char* classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* instance();
 
diff --git a/kword/KWFindReplace.h b/kword/KWFindReplace.h
index c7bdf7953..4b6e54d53 100644
--- a/kword/KWFindReplace.h
+++ b/kword/KWFindReplace.h
@@ -44,7 +44,7 @@ class KWFindReplace : public KoFindReplace
   TQ_OBJECT
 public:
     KWFindReplace( KWCanvas * canvas, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObjects, KWTextFrameSetEdit* textView );
-    KWFindReplace( KWCanvas * tqparent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObjects, KWTextFrameSetEdit* textView );
+    KWFindReplace( KWCanvas * parent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObjects, KWTextFrameSetEdit* textView );
     ~KWFindReplace();
 
     virtual void emitNewCommand(KCommand *);
diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp
index 76076ff88..24060cf23 100644
--- a/kword/KWFootNoteDia.cpp
+++ b/kword/KWFootNoteDia.cpp
@@ -34,8 +34,8 @@
 /* Class: KWFootNoteDia                                           */
 /******************************************************************/
 
-KWFootNoteDia::KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType, const TQString & _manualString, TQWidget *tqparent, KWDocument *_doc, const char *name )
-    : KDialogBase( tqparent, name, true, TQString(), Ok|Cancel|User1, Ok, true )
+KWFootNoteDia::KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType, const TQString & _manualString, TQWidget *parent, KWDocument *_doc, const char *name )
+    : KDialogBase( parent, name, true, TQString(), Ok|Cancel|User1, Ok, true )
 {
     m_doc =_doc;
     //setButtonOKText(i18n("&Insert"));
diff --git a/kword/KWFootNoteDia.h b/kword/KWFootNoteDia.h
index 7b9b5670d..f6ea84194 100644
--- a/kword/KWFootNoteDia.h
+++ b/kword/KWFootNoteDia.h
@@ -36,7 +36,7 @@ class KWFootNoteDia : public KDialogBase
   TQ_OBJECT
 
 public:
-    KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType,  const TQString & _manualString, TQWidget *tqparent, KWDocument *_doc, const char *name = 0 );
+    KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType,  const TQString & _manualString, TQWidget *parent, KWDocument *_doc, const char *name = 0 );
 
     NoteType noteType() const;
     KWFootNoteVariable::Numbering numberingType()const;
diff --git a/kword/KWFrame.h b/kword/KWFrame.h
index 531c6f380..88552259d 100644
--- a/kword/KWFrame.h
+++ b/kword/KWFrame.h
@@ -82,7 +82,7 @@ public:
 
     /**
      * Constructor
-     * @param fs tqparent frameset
+     * @param fs parent frameset
      * @param left, top, width, height coordinates of the frame
      * The page number will be automatically determined from the position of the frame.
      * @param ra the "runaround" setting, i.e. whether text should flow below the frame,
diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp
index 0d722d154..2d9cb4235 100644
--- a/kword/KWFrameDia.cpp
+++ b/kword/KWFrameDia.cpp
@@ -58,8 +58,8 @@
 /******************************************************************/
 /* Class KWBrushStylePreview - only used by kwframestylemanager   */
 /******************************************************************/
-KWBrushStylePreview::KWBrushStylePreview( TQWidget* tqparent )
-    : TQFrame(tqparent)
+KWBrushStylePreview::KWBrushStylePreview( TQWidget* parent )
+    : TQFrame(parent)
 {
 }
 
@@ -92,8 +92,8 @@ void KWBrushStylePreview::drawContents( TQPainter* painter )
  *      position/size
  ******************************************************************/
 
-KWFrameDia::KWFrameDia( TQWidget* tqparent, KWFrame *frame)
-    : KDialogBase( Tabbed, TQString(), Ok | Apply| Cancel, Ok, tqparent, "framedialog", true)
+KWFrameDia::KWFrameDia( TQWidget* parent, KWFrame *frame)
+    : KDialogBase( Tabbed, TQString(), Ok | Apply| Cancel, Ok, parent, "framedialog", true)
 {
     m_noSignal=false;
     m_frame = frame;
@@ -118,8 +118,8 @@ KWFrameDia::KWFrameDia( TQWidget* tqparent, KWFrame *frame)
 }
 
 /* Contructor when the dialog is used on creation of frame */
-KWFrameDia::KWFrameDia( TQWidget* tqparent, KWFrame *frame, KWDocument *doc, FrameSetType ft )
-    : KDialogBase( Tabbed, i18n("Frame Properties for New Frame"), Ok | Cancel, Ok, tqparent, "framedialog", true)
+KWFrameDia::KWFrameDia( TQWidget* parent, KWFrame *frame, KWDocument *doc, FrameSetType ft )
+    : KDialogBase( Tabbed, i18n("Frame Properties for New Frame"), Ok | Cancel, Ok, parent, "framedialog", true)
 {
     m_noSignal=false;
     m_frameType=ft;
@@ -137,7 +137,7 @@ KWFrameDia::KWFrameDia( TQWidget* tqparent, KWFrame *frame, KWDocument *doc, Fra
     init();
 }
 
-KWFrameDia::KWFrameDia( TQWidget *tqparent, TQPtrList<KWFrame> listOfFrames) : KDialogBase( Tabbed, i18n("Frames Properties"), Ok | Apply | Cancel, Ok, tqparent, "framedialog", true) , m_allFrames() {
+KWFrameDia::KWFrameDia( TQWidget *parent, TQPtrList<KWFrame> listOfFrames) : KDialogBase( Tabbed, i18n("Frames Properties"), Ok | Apply | Cancel, Ok, parent, "framedialog", true) , m_allFrames() {
     m_noSignal=false;
 
     m_mainFrame = m_frame = 0L;
@@ -2383,8 +2383,8 @@ bool KWFrameDia::mayDeleteFrameSet(KWTextFrameSet *fs) {
 }
 
 KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString& title,
-                                                TQWidget* tqparent, const char* name )
-    : TQGroupBox( title, tqparent, name ),
+                                                TQWidget* parent, const char* name )
+    : TQGroupBox( title, parent, name ),
       m_doc( doc ),
       m_changed( false ), m_noSignal( false )
 {
diff --git a/kword/KWFrameDia.h b/kword/KWFrameDia.h
index 554960be3..e8257b7d8 100644
--- a/kword/KWFrameDia.h
+++ b/kword/KWFrameDia.h
@@ -103,10 +103,10 @@ class KWFrameDia : public KDialogBase
   TQ_OBJECT
 public:
     /** Contructor when the dialog is used on creation of m_frame */
-    KWFrameDia( TQWidget *tqparent, KWFrame *_frame,KWDocument *_doc,FrameSetType _ft);
-    KWFrameDia( TQWidget *tqparent, KWFrame *_frame);
-    KWFrameDia( TQWidget *tqparent, TQPtrList<KWFrame> allFrames);
-    //KWFrameDia( TQWidget *tqparent, KWCanvas *_canvas);
+    KWFrameDia( TQWidget *parent, KWFrame *_frame,KWDocument *_doc,FrameSetType _ft);
+    KWFrameDia( TQWidget *parent, KWFrame *_frame);
+    KWFrameDia( TQWidget *parent, TQPtrList<KWFrame> allFrames);
+    //KWFrameDia( TQWidget *parent, KWCanvas *_canvas);
 
     //void setCanvas(KWCanvas *_canvas) {canvas =_canvas;}
 
diff --git a/kword/KWFrameList.cpp b/kword/KWFrameList.cpp
index d0f5682ee..cbdaf864b 100644
--- a/kword/KWFrameList.cpp
+++ b/kword/KWFrameList.cpp
@@ -92,7 +92,7 @@ void KWFrameList::setFrames(const TQPtrList<KWFrame> &frames) {
         // We trust that KWTableFrameSet will not make cells overlap ;)
         if ( m_frame->frameSet()->groupmanager() || daFrame->frameSet()->groupmanager() )
             continue;
-        // Skip all frames from the tqparent frameset, if 'm_frame' is floating
+        // Skip all frames from the parent frameset, if 'm_frame' is floating
         // ## might need a for loop for the case of inline-inside-inline,
         // or maybe calling isPaintedBy instead [depending on what should happen for tables]
         if ( daFrame->frameSet()->isFloating() &&
@@ -100,7 +100,7 @@ void KWFrameList::setFrames(const TQPtrList<KWFrame> &frames) {
                  daFrame->frameSet()->isPaintedBy(m_frame->frameSet())) )
             continue;
         // Floating frames are not "on top", they are "inside".
-        // They are not "below" anything either - the tqparent frameset is.
+        // They are not "below" anything either - the parent frameset is.
         if ( m_frame->frameSet()->isFloating() )
             continue;
         KoRect intersect = m_frame->intersect( daFrame->outerKoRect() );
diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h
index b714d96db..7218abe76 100644
--- a/kword/KWFrameSet.h
+++ b/kword/KWFrameSet.h
@@ -299,7 +299,7 @@ public:
     };
     /**
      * Called when our frames change, or when another frameset's frames change.
-     * Framesets can reimplement it, but should always call the tqparent method.
+     * Framesets can reimplement it, but should always call the parent method.
      */
     virtual void updateFrames( int flags = 0xff );
 
@@ -337,7 +337,7 @@ public:
     //virtual void preparePrinting( TQPainter *, TQProgressDialog *, int & ) { }
 
     /** Called once the frameset has been completely loaded or constructed.
-     * The default implementation calls updateFrames() and zoom(). Call the tqparent :) */
+     * The default implementation calls updateFrames() and zoom(). Call the parent :) */
     virtual void finalize();
 
     virtual int paragraphs() { return 0; }
@@ -390,7 +390,7 @@ public:
     virtual KoSize floatingFrameSize( int frameNum = 0 );
     /** Get the rect of the "floating frame" identified by frameNum,
         in coordinates RELATIVE TO THE PARENT FRAMESET.
-        This is especially important for multi-tqparent inline frames. */
+        This is especially important for multi-parent inline frames. */
     KoRect floatingFrameRect( int frameNum = 0 );
     /** Get the 'baseline' to use for the "floating frame" identified by frameNum.
         -1 means same as the height (usual case) */
diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp
index 0a7707704..781e9e8ff 100644
--- a/kword/KWFrameStyleManager.cpp
+++ b/kword/KWFrameStyleManager.cpp
@@ -564,8 +564,8 @@ void KWFrameStyleManager::renameStyle(const TQString &theText) {
 /* Class: KWFrameStyleBackgroundTab                               */
 /******************************************************************/
 
-KWFrameStyleBackgroundTab::KWFrameStyleBackgroundTab( TQWidget * tqparent )
-    : KWFrameStyleManagerTab( tqparent )
+KWFrameStyleBackgroundTab::KWFrameStyleBackgroundTab( TQWidget * parent )
+    : KWFrameStyleManagerTab( parent )
 {
     bgwidget = this;
     m_backgroundColor.setStyle( Qt::SolidPattern );
@@ -621,8 +621,8 @@ void KWFrameStyleBackgroundTab::save()
 /* Class: KWFrameStyleBordersTab                                  */
 /******************************************************************/
 
-KWFrameStyleBordersTab::KWFrameStyleBordersTab( TQWidget * tqparent )
-    : KWFrameStyleManagerTab( tqparent )
+KWFrameStyleBordersTab::KWFrameStyleBordersTab( TQWidget * parent )
+    : KWFrameStyleManagerTab( parent )
 {
     m_widget = 0L;
     m_borders = new KoParagLayout();
diff --git a/kword/KWFrameStyleManager.h b/kword/KWFrameStyleManager.h
index c44adb82b..f261b2cdb 100644
--- a/kword/KWFrameStyleManager.h
+++ b/kword/KWFrameStyleManager.h
@@ -50,8 +50,8 @@ class KWFrameStylePreview : public TQWidget
   TQ_OBJECT
 
 public:
-    KWFrameStylePreview( TQWidget *tqparent )
-        : TQWidget( tqparent ), frameStyle( 0 ) {
+    KWFrameStylePreview( TQWidget *parent )
+        : TQWidget( parent ), frameStyle( 0 ) {
             setBackgroundColor( white );
         }
 
@@ -158,7 +158,7 @@ class KWFrameStyleManagerTab : public TQWidget {
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWFrameStyleManagerTab(TQWidget *tqparent) : TQWidget(tqparent) {};
+    KWFrameStyleManagerTab(TQWidget *parent) : TQWidget(parent) {};
 
     /** the new style which is to be displayed */
     void setStyle(KWFrameStyle *style) { m_style = style; }
@@ -177,7 +177,7 @@ class KWFrameStyleBackgroundTab : public KWFrameStyleManagerTab
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWFrameStyleBackgroundTab( TQWidget * tqparent );
+    KWFrameStyleBackgroundTab( TQWidget * parent );
 
     virtual void update();
     virtual void save();
@@ -197,7 +197,7 @@ class KWFrameStyleBordersTab : public KWFrameStyleManagerTab
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWFrameStyleBordersTab( TQWidget * tqparent );
+    KWFrameStyleBordersTab( TQWidget * parent );
     ~KWFrameStyleBordersTab();
     void setWidget( KoParagLayoutWidget * widget );
 
diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp
index 4904ec986..927b0f138 100644
--- a/kword/KWFrameView.cpp
+++ b/kword/KWFrameView.cpp
@@ -39,8 +39,8 @@
 static const double HORIZONTAL_SNAP = 6; // horizontal snap zone (in pt)
 static const double VERTICAL_SNAP = 6; // vertical snap zone (in pt)
 
-KWFrameView::KWFrameView(KWFrameViewManager *tqparent, KWFrame *frame) {
-    m_manager = tqparent;
+KWFrameView::KWFrameView(KWFrameViewManager *parent, KWFrame *frame) {
+    m_manager = parent;
     Q_ASSERT(frame);
     Q_ASSERT(frame->frameSet());
     m_frame = frame;
@@ -243,7 +243,7 @@ MouseMeaning TableFramePolicy::mouseMeaning( const KoPoint &point, int keyState
         return MEANING_MOUSE_SELECT;
     // Shift _and_ at least a frame is selected already
     // (shift + no frame selected is used to select text)
-    if ( (keyState & TQt::ShiftButton) && m_view->tqparent()->selectedFrame() != 0 )
+    if ( (keyState & TQt::ShiftButton) && m_view->parent()->selectedFrame() != 0 )
         return MEANING_MOUSE_SELECT;
 
     return MEANING_MOUSE_INSIDE_TEXT;
@@ -291,7 +291,7 @@ void TableFramePolicy::setSelected(MouseMeaning selectPolicy) {
         unsigned int column = static_cast<KWTableFrameSet::Cell *>(fs)->firstColumn();
         for (KWTableFrameSet::TableIter cells(fs->groupmanager()); cells; ++cells) {
             if(cells->firstColumn() >= column && cells->lastColumn() <= column) {
-                KWFrameView *fv = m_view->tqparent()->view(cells->frame(0));
+                KWFrameView *fv = m_view->parent()->view(cells->frame(0));
                 if(fv)
                     fv->setSelected(true);
             }
@@ -301,7 +301,7 @@ void TableFramePolicy::setSelected(MouseMeaning selectPolicy) {
         unsigned int row = static_cast<KWTableFrameSet::Cell *>(fs)->firstRow();
         for (KWTableFrameSet::TableIter cells(fs->groupmanager()); cells; ++cells) {
             if(cells->firstRow() >= row && cells->lastRow() <= row) {
-                KWFrameView *fv = m_view->tqparent()->view(cells->frame(0));
+                KWFrameView *fv = m_view->parent()->view(cells->frame(0));
                 if(fv)
                     fv->setSelected(true);
             }
diff --git a/kword/KWFrameView.h b/kword/KWFrameView.h
index d7b63aba3..c7017bf7b 100644
--- a/kword/KWFrameView.h
+++ b/kword/KWFrameView.h
@@ -38,19 +38,19 @@ public:
     /** Constructor */
     FramePolicy(KWFrameView *view);
     /**
-     * Return the MouseMeaning enum value for the tqparent view.
+     * Return the MouseMeaning enum value for the parent view.
      * @param point the point where the mouse is hovering.
-     * @param keyState the bittqmask of keys that are pressed.  Same as Event::state();
+     * @param keyState the bitmask of keys that are pressed.  Same as Event::state();
      */
     virtual MouseMeaning mouseMeaning( const KoPoint &point, int keyState ) = 0;
     /**
      * Return a fully initialized popup for the context of frame at @p point
      * @param point the point where the mouse is hovering.
-     * @param view the tqparent view widget
+     * @param view the parent view widget
      */
     virtual TQPopupMenu* createPopup( const KoPoint &point, KWView *view ) = 0;
     /**
-     * Override this method to do more than select the tqparent frame-view
+     * Override this method to do more than select the parent frame-view
      */
     virtual void setSelected(MouseMeaning) { }
 
@@ -58,12 +58,12 @@ protected:
     /**
      * Shared method for all policies called when the border of the frame is clicked.
      * @param point the point where the mouse is hovering.
-     * @param keyState the bittqmask of keys that are pressed.  Same as Event::state();
+     * @param keyState the bitmask of keys that are pressed.  Same as Event::state();
      */
     virtual MouseMeaning mouseMeaningOnBorder(const KoPoint &point, int keyState);
     /**
      * Shared method for all policies to add the 'set floating' action to a popup menu.
-     * @param view the tqparent view widget
+     * @param view the parent view widget
      * @param actionList the list of actions where the floating action should be added to
      */
     void addFloatingAction(KWView *view, TQPtrList<KAction> &actionList);
@@ -83,10 +83,10 @@ class KWFrameView {
 public:
     /**
      * Constructor
-     * @param tqparent the tqparent
+     * @param parent the parent
      * @param frame the frame this view represents.
      */
-    KWFrameView(KWFrameViewManager *tqparent, KWFrame *frame);
+    KWFrameView(KWFrameViewManager *parent, KWFrame *frame);
     virtual ~KWFrameView();
 
     /// returns if this frameView is selected.  A selected frame is shown differently on screen.
@@ -108,22 +108,22 @@ public:
     bool contains(const KoPoint &point, bool fuzzy = true) const;
 
     /**
-     * Return the MouseMeaning enum value for the tqparent view.
+     * Return the MouseMeaning enum value for the parent view.
      * @param point the point where the mouse is hovering.
-     * @param keyState the bittqmask of keys that are pressed.  Same as Event::state();
+     * @param keyState the bitmask of keys that are pressed.  Same as Event::state();
      */
     MouseMeaning mouseMeaning( const KoPoint &point, int keyState );
 
-    /// Return the tqparent KWFrameViewManager this frameView belongs to
-    KWFrameViewManager *tqparent() const { return m_manager; }
+    /// Return the parent KWFrameViewManager this frameView belongs to
+    KWFrameViewManager *parent() const { return m_manager; }
 
     /**
      * Show a context-sensitive popup menu based on the location of 'point'.
      * @param point the point at which the mouse was clicked. The context is based on
      *   what is present at that location.
-     * @param popupPoint the point in the same coordinate system as the tqparent widget of
+     * @param popupPoint the point in the same coordinate system as the parent widget of
      *   where the popup menu should be located.
-     * @param view the tqparent widget for the popup.
+     * @param view the parent widget for the popup.
      */
     void showPopup( const KoPoint &point, KWView *view, const TQPoint &popupPoint) const;
 
diff --git a/kword/KWFrameViewManager.h b/kword/KWFrameViewManager.h
index 43ec918e2..00e4e08ba 100644
--- a/kword/KWFrameViewManager.h
+++ b/kword/KWFrameViewManager.h
@@ -105,14 +105,14 @@ public:
      * All the frames that have a presence at the point are considered and depending on
      * what kind of frame and where in the frame the mouse is the meaning is calculated.
      * @param point the point where the mouse is hovering.
-     * @param keyState the bittqmask of keys that are pressed.  Same as Event::state();
+     * @param keyState the bitmask of keys that are pressed.  Same as Event::state();
      */
     MouseMeaning mouseMeaning( const KoPoint &point, int keyState) const;
     /**
      * Similar to mouseMeaning(), but instead of returning the meaning this will return
      * a mouse cursor to represent the action.
      * @param point the point where the mouse is hovering.
-     * @param keyState the bittqmask of keys that are pressed.  Same as Event::state();
+     * @param keyState the bitmask of keys that are pressed.  Same as Event::state();
      */
     TQCursor mouseCursor( const KoPoint &point, int keyState ) const;
 
@@ -120,10 +120,10 @@ public:
      * Show a context-sensitive popup menu based on the location of 'point'.
      * @param point the point at which the mouse was clicked. The context is based on
      *   what is present at that location.
-     * @param keyState the bittqmask of keys that are pressed.  Same as Event::state();
-     * @param popupPoint the point in the same coordinate system as the tqparent widget of
+     * @param keyState the bitmask of keys that are pressed.  Same as Event::state();
+     * @param popupPoint the point in the same coordinate system as the parent widget of
      *   where the popup menu should be located.
-     * @param view the tqparent widget for the popup.
+     * @param view the parent widget for the popup.
      */
     void showPopup( const KoPoint &point, KWView *view, int keyState, const TQPoint &popupPoint) const;
 
@@ -137,7 +137,7 @@ public:
      * / or unselecting any frames based on this information.
      * @param leftClick true if this select is due to the main button being clicked.
      * @param point the point clicked.
-     * @param keyState the bittqmask of keys that are pressed.  Same as Event::state();
+     * @param keyState the bitmask of keys that are pressed.  Same as Event::state();
      */
     void selectFrames(const KoPoint &point, int keyState, bool leftClick);
 
diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp
index c76609932..725c932e1 100644
--- a/kword/KWImportStyleDia.cpp
+++ b/kword/KWImportStyleDia.cpp
@@ -36,8 +36,8 @@
 
 #include "KWTextParag.h"
 
-KWImportStyleDia::KWImportStyleDia( KWDocument *_doc, KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name )
-    :KoImportStyleDia( currentCollection, tqparent, name ),
+KWImportStyleDia::KWImportStyleDia( KWDocument *_doc, KoStyleCollection* currentCollection, TQWidget *parent, const char *name )
+    :KoImportStyleDia( currentCollection, parent, name ),
      m_doc(_doc)
 {
 
@@ -166,8 +166,8 @@ void KWImportStyleDia::loadFile()
     delete store;
 }
 
-KWImportFrameTableStyleDia::KWImportFrameTableStyleDia( KWDocument *_doc, const TQStringList &_list, StyleType _type, TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
+KWImportFrameTableStyleDia::KWImportFrameTableStyleDia( KWDocument *_doc, const TQStringList &_list, StyleType _type, TQWidget *parent, const char *name )
+    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
 {
     setCaption( i18n("Import Style") );
     m_doc=_doc;
diff --git a/kword/KWImportStyleDia.h b/kword/KWImportStyleDia.h
index 075a83fda..16918e42d 100644
--- a/kword/KWImportStyleDia.h
+++ b/kword/KWImportStyleDia.h
@@ -38,7 +38,7 @@ class KWImportStyleDia : public KoImportStyleDia
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWImportStyleDia( KWDocument *_doc, KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name = 0 );
+    KWImportStyleDia( KWDocument *_doc, KoStyleCollection* currentCollection, TQWidget *parent, const char *name = 0 );
     ~KWImportStyleDia();
 
 protected:
@@ -55,7 +55,7 @@ class KWImportFrameTableStyleDia : public KDialogBase
   TQ_OBJECT
 public:
     enum StyleType { frameStyle, TableStyle};
-    KWImportFrameTableStyleDia( KWDocument *_doc, const TQStringList & _list, StyleType _type , TQWidget *tqparent, const char *name );
+    KWImportFrameTableStyleDia( KWDocument *_doc, const TQStringList & _list, StyleType _type , TQWidget *parent, const char *name );
     ~KWImportFrameTableStyleDia();
     TQPtrList<KWFrameStyle> listOfFrameStyleImported() const { return m_frameStyleList;}
     TQPtrList<KWTableStyle> listOfTableStyleImported() const { return m_tableStyleList;}
diff --git a/kword/KWInsertDia.cpp b/kword/KWInsertDia.cpp
index 883332bd8..097646084 100644
--- a/kword/KWInsertDia.cpp
+++ b/kword/KWInsertDia.cpp
@@ -30,12 +30,12 @@
 #include <tqbuttongroup.h>
 #include <tqlayout.h>
 
-KWInsertDia::KWInsertDia( KWView *tqparent, KWTableFrameSet *table, InsertType type, int insertHint)
-    : KDialogBase( Plain, (type==insertRow?i18n("Insert Row") : i18n("Insert Column")), Ok | Cancel, Ok, tqparent, "Insert Table items dialog", true )
+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 )
 {
     m_type = type;
     m_table = table;
-    m_view = tqparent;
+    m_view = parent;
 
     setupTab1(insertHint);
 }
diff --git a/kword/KWInsertDia.h b/kword/KWInsertDia.h
index bb3b30caf..2a6d6d82b 100644
--- a/kword/KWInsertDia.h
+++ b/kword/KWInsertDia.h
@@ -35,7 +35,7 @@ class KWInsertDia : public KDialogBase
 
 public:
     enum InsertType {insertRow, insertColumn};
-    KWInsertDia( KWView *tqparent, KWTableFrameSet *table, InsertType type, int insertHint);
+    KWInsertDia( KWView *parent, KWTableFrameSet *table, InsertType type, int insertHint);
 
 protected:
     void setupTab1(int insertHint);
diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp
index f8b6ace05..28d0cd348 100644
--- a/kword/KWInsertPageDia.cpp
+++ b/kword/KWInsertPageDia.cpp
@@ -27,8 +27,8 @@
 #include <tqbuttongroup.h>
 #include <tqvbox.h>
 
-KWInsertPageDia::KWInsertPageDia( TQWidget *tqparent, const char* name )
-    : KDialogBase( tqparent, name,TRUE,i18n("Insert Page"),Ok|Cancel )
+KWInsertPageDia::KWInsertPageDia( TQWidget *parent, const char* name )
+    : KDialogBase( parent, name,TRUE,i18n("Insert Page"),Ok|Cancel )
 {
     TQVBox *page = makeVBoxMainWidget();
 
diff --git a/kword/KWInsertPageDia.h b/kword/KWInsertPageDia.h
index daa145c78..f67f7b7ea 100644
--- a/kword/KWInsertPageDia.h
+++ b/kword/KWInsertPageDia.h
@@ -28,7 +28,7 @@ class KWInsertPageDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWInsertPageDia( TQWidget *tqparent, const char* name );
+    KWInsertPageDia( TQWidget *parent, const char* name );
     InsertPagePos insertPagePos() const;
 
 private:
diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp
index a8b6ee494..4b5f3daa0 100644
--- a/kword/KWInsertPicDia.cpp
+++ b/kword/KWInsertPicDia.cpp
@@ -46,8 +46,8 @@
 class KWInsertPicPreview : public TQScrollView
 {
 public:
-    KWInsertPicPreview( TQWidget *tqparent )
-        : TQScrollView( tqparent )
+    KWInsertPicPreview( TQWidget *parent )
+        : TQScrollView( parent )
     {
         viewport()->setBackgroundMode( PaletteBase );
         setMinimumSize( 300, 200 );
@@ -84,8 +84,8 @@ private:
 
 //////////////
 
-KWInsertPicDia::KWInsertPicDia( TQWidget *tqparent, bool _inline, bool _keepRatio, KWDocument *_doc, const char *name )
-    : KDialogBase( Plain, i18n("Insert Picture"), Ok|Cancel, Ok, tqparent, name, true ),
+KWInsertPicDia::KWInsertPicDia( TQWidget *parent, bool _inline, bool _keepRatio, KWDocument *_doc, const char *name )
+    : KDialogBase( Plain, i18n("Insert Picture"), Ok|Cancel, Ok, parent, name, true ),
     m_bFirst ( true ), m_doc ( _doc )
 {
     setInitialSize( TQSize(400, 300) );
@@ -145,18 +145,18 @@ void KWInsertPicDia::slotChooseImage()
     m_bFirst = false;
 }
 
-KoPicture KWInsertPicDia::selectPictureDia( const TQString & _path, TQWidget* tqparent )
+KoPicture KWInsertPicDia::selectPictureDia( const TQString & _path, TQWidget* parent )
 {
     TQStringList mimetypes ( KImageIO::mimeTypes( KImageIO::Reading ) );
     mimetypes += KoPictureFilePreview::clipartMimeTypes();
 
-    KFileDialog fd( _path, TQString(), tqparent, 0, TRUE );
+    KFileDialog fd( _path, TQString(), parent, 0, TRUE );
     fd.setMimeFilter( mimetypes );
     fd.setCaption(i18n("Choose Picture"));
-    return selectPicture( fd, tqparent );
+    return selectPicture( fd, parent );
 }
 
-KoPicture KWInsertPicDia::selectPicture( KFileDialog & fd, TQWidget *tqparent )
+KoPicture KWInsertPicDia::selectPicture( KFileDialog & fd, TQWidget *parent )
 {
     KoPicture picture;
 
@@ -166,7 +166,7 @@ KoPicture KWInsertPicDia::selectPicture( KFileDialog & fd, TQWidget *tqparent )
         url = fd.selectedURL();
 
     if( !url.isEmpty() )
-        picture.setKeyAndDownloadPicture( url, tqparent );
+        picture.setKeyAndDownloadPicture( url, parent );
 
     return picture;
 }
diff --git a/kword/KWInsertPicDia.h b/kword/KWInsertPicDia.h
index e9acaf751..1c151b2af 100644
--- a/kword/KWInsertPicDia.h
+++ b/kword/KWInsertPicDia.h
@@ -31,7 +31,7 @@ class KWInsertPicDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWInsertPicDia( TQWidget *tqparent, bool _inline, bool _keepRatio, KWDocument *_doc, const char *name = 0 );
+    KWInsertPicDia( TQWidget *parent, bool _inline, bool _keepRatio, KWDocument *_doc, const char *name = 0 );
 
     bool makeInline() const;
 
@@ -41,7 +41,7 @@ public:
      * @param _path the name of the old file
      * @return the loaded picture (Picture is null if cancelled.)
      */
-    static KoPicture selectPictureDia( const TQString & _path, TQWidget* tqparent );
+    static KoPicture selectPictureDia( const TQString & _path, TQWidget* parent );
 
     KoPicture picture ( void ) const;
 
@@ -49,7 +49,7 @@ protected slots:
     void slotChooseImage();
 
 protected:
-    static KoPicture selectPicture( KFileDialog & fd, TQWidget *tqparent );
+    static KoPicture selectPicture( KFileDialog & fd, TQWidget *parent );
 
 private:
 
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index 244c2006c..e477f5021 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -326,7 +326,7 @@ int KWMailMergeDataBase::version() {
 
 KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList offers )
     : KDialogBase( Plain, i18n( "Mail Merge Setup" ), Ok | Cancel, Ok,
-      /*tqparent*/ 0, "", true ), pluginOffers( offers )
+      /*parent*/ 0, "", true ), pluginOffers( offers )
 {
   TQWidget *back = plainPage();
   TQVBoxLayout *tqlayout = new TQVBoxLayout( back, 0, spacingHint() );
@@ -382,8 +382,8 @@ void KWMailMergeChoosePluginDialog::pluginChanged( int pos )
  *
  ******************************************************************/
 
-KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *tqparent,KWMailMergeDataBase *db)
-    : KDialogBase(Plain, i18n( "Mail Merge Setup" ), Close, Close, tqparent, "", true )
+KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDataBase *db)
+    : KDialogBase(Plain, i18n( "Mail Merge Setup" ), Close, Close, parent, "", true )
 {
     db_=db;
     TQWidget *back = plainPage();
@@ -450,7 +450,7 @@ void KWMailMergeConfigDialog::enableDisableEdit()
 
 void KWMailMergeConfigDialog::slotEditClicked()
 {db_->action=KWSLEdit;
- if (db_->plugin) db_->plugin->showConfigDialog((TQWidget*)tqparent(),KWSLEdit);
+ if (db_->plugin) db_->plugin->showConfigDialog((TQWidget*)parent(),KWSLEdit);
 }
 
 void KWMailMergeConfigDialog::slotCreateClicked()
@@ -482,7 +482,7 @@ void KWMailMergeConfigDialog::slotOpenClicked()
 void KWMailMergeConfigDialog::slotPreviewClicked()
 {
     db_->action=KWSLMergePreview;
-    KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)tqparent())->tqtopLevelWidget());
+    KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->tqtopLevelWidget());
     if (mw)
     {
         KAction *ac=mw->actionCollection()->action(KStdAction::stdName(KStdAction::PrintPreview));
@@ -509,9 +509,9 @@ KWMailMergeConfigDialog::~KWMailMergeConfigDialog()
  *
  ******************************************************************/
 
-KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *tqparent, KWMailMergeDataBase *db )
+KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KWMailMergeDataBase *db )
   : KDialogBase( Plain, i18n( "Mail Merge - Variable Name" ),
-                 Ok | Cancel, Ok, tqparent, "", true )
+                 Ok | Cancel, Ok, parent, "", true )
 {
   m_db=db;
   TQWidget *page = plainPage();
diff --git a/kword/KWMailMergeDataBase.h b/kword/KWMailMergeDataBase.h
index 2906ebe83..70f75f9ec 100644
--- a/kword/KWMailMergeDataBase.h
+++ b/kword/KWMailMergeDataBase.h
@@ -120,7 +120,7 @@ class KWMailMergeConfigDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-   KWMailMergeConfigDialog ( TQWidget *tqparent, KWMailMergeDataBase *db );
+   KWMailMergeConfigDialog ( TQWidget *parent, KWMailMergeDataBase *db );
    ~KWMailMergeConfigDialog();
 protected:
     TQPushButton *edit;
@@ -152,7 +152,7 @@ class KWMailMergeVariableInsertDia : public KDialogBase
   TQ_OBJECT
 
   public:
-    KWMailMergeVariableInsertDia( TQWidget *tqparent, KWMailMergeDataBase *db );
+    KWMailMergeVariableInsertDia( TQWidget *parent, KWMailMergeDataBase *db );
     TQString getName() const; // ### unused, can we remove this?
 
   protected slots:
diff --git a/kword/KWMailMergeDataSource.cpp b/kword/KWMailMergeDataSource.cpp
index e95085e77..d21c4bd02 100644
--- a/kword/KWMailMergeDataSource.cpp
+++ b/kword/KWMailMergeDataSource.cpp
@@ -1,8 +1,8 @@
 #include "KWMailMergeDataSource.h"
 #include "KWMailMergeDataSource.moc"
 
-KWMailMergeDataSource::KWMailMergeDataSource(KInstance* inst,TQObject *tqparent): TQObject(tqparent),
-DCOPObject(TQCString(tqparent->name())+".plugin_loading"),m_instance(inst)
+KWMailMergeDataSource::KWMailMergeDataSource(KInstance* inst,TQObject *parent): TQObject(parent),
+DCOPObject(TQCString(parent->name())+".plugin_loading"),m_instance(inst)
 {
 }
 const TQMap< TQString, TQString > &KWMailMergeDataSource::getRecordEntries() const {return sampleRecord;}
diff --git a/kword/KWMailMergeDataSource.h b/kword/KWMailMergeDataSource.h
index b773c7a8c..d27c509d9 100644
--- a/kword/KWMailMergeDataSource.h
+++ b/kword/KWMailMergeDataSource.h
@@ -49,7 +49,7 @@ class KWORD_EXPORT KWMailMergeDataSource: public TQObject, public DCOPObject
 //    TQ_OBJECT
     K_DCOP
     public:
-    KWMailMergeDataSource(KInstance* inst,TQObject *tqparent);
+    KWMailMergeDataSource(KInstance* inst,TQObject *parent);
     virtual ~KWMailMergeDataSource(){;}
     virtual class TQString getValue( const class TQString &name, int record = -1 ) const=0;
 
diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp
index 7adce7f30..fdea1cf7e 100644
--- a/kword/KWMailMergeLabelAction.cpp
+++ b/kword/KWMailMergeLabelAction.cpp
@@ -30,8 +30,8 @@
 class MailMergeDraggableLabel : public TQToolButton
 {
 public:
-    MailMergeDraggableLabel( KoMainWindow * mw, const TQString & text, TQWidget * tqparent = 0, const char * name = 0 )
-        : TQToolButton( tqparent, name ), m_mw(mw)
+    MailMergeDraggableLabel( KoMainWindow * mw, const TQString & text, TQWidget * parent = 0, const char * name = 0 )
+        : TQToolButton( parent, name ), m_mw(mw)
     {
         setText(text);
         setAcceptDrops(true);
@@ -103,8 +103,8 @@ private:
 
 
 KWMailMergeLabelAction::KWMailMergeLabelAction( const TQString &text, int accel,
-                    TQObject* receiver, const char* slot, TQObject *tqparent, const char *name )
-    : KAction( text, accel, receiver, slot, tqparent, name ), m_label( 0L )
+                    TQObject* receiver, const char* slot, TQObject *parent, const char *name )
+    : KAction( text, accel, receiver, slot, parent, name ), m_label( 0L )
 {
 }
 
diff --git a/kword/KWMailMergeLabelAction.h b/kword/KWMailMergeLabelAction.h
index da5238640..3a38e2d9a 100644
--- a/kword/KWMailMergeLabelAction.h
+++ b/kword/KWMailMergeLabelAction.h
@@ -33,7 +33,7 @@ class KWMailMergeLabelAction : public KAction
   TQ_OBJECT
 public:
   KWMailMergeLabelAction( const TQString &text, int accel,
-                    TQObject* receiver, const char* slot, TQObject *tqparent = 0, const char *name = 0 );
+                    TQObject* receiver, const char* slot, TQObject *parent = 0, const char *name = 0 );
 
   virtual int plug( TQWidget *widget, int index = -1 );
   virtual void unplug( TQWidget *widget );
diff --git a/kword/KWPage.cpp b/kword/KWPage.cpp
index 3518d673e..4f8765dfc 100644
--- a/kword/KWPage.cpp
+++ b/kword/KWPage.cpp
@@ -21,8 +21,8 @@
 
 #include <tqrect.h>
 
-KWPage::KWPage(KWPageManager *tqparent, int pageNum) {
-    m_parent = tqparent;
+KWPage::KWPage(KWPageManager *parent, int pageNum) {
+    m_parent = parent;
     m_pageNum = pageNum;
     m_pageLayout.ptWidth = -1.0;
     m_pageLayout.ptHeight = -1.0;
diff --git a/kword/KWPage.h b/kword/KWPage.h
index b30a2ff9b..44bffc2ac 100644
--- a/kword/KWPage.h
+++ b/kword/KWPage.h
@@ -112,10 +112,10 @@ public:
 
 private:
     /** private constructor, only for our friends
-     * @param tqparent the KWPageManager that we belong to.
+     * @param parent the KWPageManager that we belong to.
      * @param pageNum the number of the page as the user will see it.
      */
-    KWPage(KWPageManager *tqparent, int pageNum);
+    KWPage(KWPageManager *parent, int pageNum);
     int m_pageNum;
     PageSideEnum m_pageSide;
     KoPageLayout m_pageLayout;
diff --git a/kword/KWPartFrameSet.h b/kword/KWPartFrameSet.h
index 5a85853d2..25609c1a7 100644
--- a/kword/KWPartFrameSet.h
+++ b/kword/KWPartFrameSet.h
@@ -154,7 +154,7 @@ public:
     KWDocumentChild( KWDocument *_wdoc );
     ~KWDocumentChild();
 
-    KWDocument* tqparent()const
+    KWDocument* parent()const
     { return m_pKWordDoc; }
 
     virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry );
diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp
index ec77394aa..3502701be 100644
--- a/kword/KWResizeTableDia.cpp
+++ b/kword/KWResizeTableDia.cpp
@@ -28,8 +28,8 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 
-KWResizeTableDia::KWResizeTableDia( TQWidget *tqparent, KWTableFrameSet *table, KWDocument *doc, int resizeColumn )
-    : KDialogBase( tqparent, "resize column dialog" , true, "", Ok | Cancel | User1 | Apply )
+KWResizeTableDia::KWResizeTableDia( TQWidget *parent, KWTableFrameSet *table, KWDocument *doc, int resizeColumn )
+    : KDialogBase( parent, "resize column dialog" , true, "", Ok | Cancel | User1 | Apply )
 {
     setButtonText( KDialogBase::User1, i18n("Reset") );
     setCaption( i18n( "Resize Column" ) );
diff --git a/kword/KWResizeTableDia.h b/kword/KWResizeTableDia.h
index f15122697..7ca65eaea 100644
--- a/kword/KWResizeTableDia.h
+++ b/kword/KWResizeTableDia.h
@@ -39,12 +39,12 @@ class KWResizeTableDia : public KDialogBase
 public:
     /**
      * Constructor.
-     * @param tqparent tqparent widget for dialog
+     * @param parent parent widget for dialog
      * @param table the table to do the resizes on
      * @param doc the document this table belongs to, for undo information
      * @param resizeColumn the initial column that the user can resize.
      */
-    KWResizeTableDia( TQWidget *tqparent, KWTableFrameSet *table, KWDocument *doc, int resizeColumn);
+    KWResizeTableDia( TQWidget *parent, KWTableFrameSet *table, KWDocument *doc, int resizeColumn);
 
 protected:
     void setupTab1( int resizeColumn);
diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp
index 614e790c4..047dcf935 100644
--- a/kword/KWSortDia.cpp
+++ b/kword/KWSortDia.cpp
@@ -27,8 +27,8 @@
 #include <tqbuttongroup.h>
 #include <tqvbox.h>
 
-KWSortDia::KWSortDia( TQWidget *tqparent, const char* name )
-    : KDialogBase( tqparent, name,TRUE,i18n("Sort Text"),Ok|Cancel )
+KWSortDia::KWSortDia( TQWidget *parent, const char* name )
+    : KDialogBase( parent, name,TRUE,i18n("Sort Text"),Ok|Cancel )
 {
     TQVBox *page = makeVBoxMainWidget();
 
diff --git a/kword/KWSortDia.h b/kword/KWSortDia.h
index 2ecc1c684..451e03436 100644
--- a/kword/KWSortDia.h
+++ b/kword/KWSortDia.h
@@ -28,7 +28,7 @@ class KWSortDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWSortDia( TQWidget *tqparent, const char* name );
+    KWSortDia( TQWidget *parent, const char* name );
     SortType getSortType() const;
 
 private:
diff --git a/kword/KWSplitCellDia.cpp b/kword/KWSplitCellDia.cpp
index c753f4df7..5e988ea3f 100644
--- a/kword/KWSplitCellDia.cpp
+++ b/kword/KWSplitCellDia.cpp
@@ -27,8 +27,8 @@
 
 #include <klocale.h>
 
-KWSplitCellDia::KWSplitCellDia( TQWidget* tqparent, const char* name, unsigned int columns, unsigned int rows)
-    : KDialogBase( Plain, i18n("Split Cell"), Ok | Cancel, Ok, tqparent, name, true)
+KWSplitCellDia::KWSplitCellDia( TQWidget* parent, const char* name, unsigned int columns, unsigned int rows)
+    : KDialogBase( Plain, i18n("Split Cell"), Ok | Cancel, Ok, parent, name, true)
 {
     m_cols = columns;
     m_rows = rows;
diff --git a/kword/KWSplitCellDia.h b/kword/KWSplitCellDia.h
index 4a6aa3769..c23a1f11a 100644
--- a/kword/KWSplitCellDia.h
+++ b/kword/KWSplitCellDia.h
@@ -36,7 +36,7 @@ class KWSplitCellDia : public KDialogBase {
   TQ_OBJECT
 
 public:
-    KWSplitCellDia( TQWidget *tqparent, const char *name, unsigned int numcols, unsigned int numrows);
+    KWSplitCellDia( TQWidget *parent, const char *name, unsigned int numcols, unsigned int numrows);
 
     unsigned int rows()const { return m_rows; }
     unsigned int columns()const { return m_cols; }
diff --git a/kword/KWStartupWidget.cpp b/kword/KWStartupWidget.cpp
index 644eca2bb..60dab02bf 100644
--- a/kword/KWStartupWidget.cpp
+++ b/kword/KWStartupWidget.cpp
@@ -27,8 +27,8 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-KWStartupWidget::KWStartupWidget(TQWidget *tqparent, KWDocument *doc, const KoColumns &columns)
-    : KWStartupWidgetBase(tqparent) {
+KWStartupWidget::KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColumns &columns)
+    : KWStartupWidgetBase(parent) {
     m_columns = columns;
     m_layout = KoPageLayout::standardLayout();
     m_doc = doc;
diff --git a/kword/KWStartupWidget.h b/kword/KWStartupWidget.h
index 4106ac2fa..8202488c1 100644
--- a/kword/KWStartupWidget.h
+++ b/kword/KWStartupWidget.h
@@ -36,11 +36,11 @@ class KWStartupWidget : public KWStartupWidgetBase {
 public:
     /**
      * Constructor. Please note that this class is being used/created by KWDocument.
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param doc the document that wants to be altered
      * @param columns the suggested columns to be shown initially
      */
-    KWStartupWidget(TQWidget *tqparent, KWDocument *doc, const KoColumns &columns);
+    KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColumns &columns);
 
 private slots:
     void sizeUpdated(KoPageLayout &tqlayout);
diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp
index a95154f54..e8cd0e92d 100644
--- a/kword/KWStatisticsDialog.cpp
+++ b/kword/KWStatisticsDialog.cpp
@@ -27,8 +27,8 @@
 #include <tqprogressdialog.h>
 #include <tqcheckbox.h>
 
-KWStatisticsDialog::KWStatisticsDialog( TQWidget *tqparent, KWDocument *document )
-    : KDialogBase(tqparent, "statistics", true, i18n("Statistics"),KDialogBase::Ok, KDialogBase::Ok, false )
+KWStatisticsDialog::KWStatisticsDialog( TQWidget *parent, KWDocument *document )
+    : KDialogBase(parent, "statistics", true, i18n("Statistics"),KDialogBase::Ok, KDialogBase::Ok, false )
 {
     TQWidget *page = new TQWidget( this );
     setMainWidget(page);
@@ -45,7 +45,7 @@ KWStatisticsDialog::KWStatisticsDialog( TQWidget *tqparent, KWDocument *document
             m_resultGeneralLabel[i]=0;
     }
     m_doc = document;
-    m_parent = tqparent;
+    m_parent = parent;
     m_canceled = true;
 
 
diff --git a/kword/KWStatisticsDialog.h b/kword/KWStatisticsDialog.h
index 0eece6a3b..064b6ef25 100644
--- a/kword/KWStatisticsDialog.h
+++ b/kword/KWStatisticsDialog.h
@@ -37,7 +37,7 @@ class KWStatisticsDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    KWStatisticsDialog( TQWidget *tqparent, KWDocument *doc );
+    KWStatisticsDialog( TQWidget *parent, KWDocument *doc );
     bool wasCanceled()const { return m_canceled; }
 
 private:
diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp
index 711c76c50..013a2be61 100644
--- a/kword/KWTableDia.cpp
+++ b/kword/KWTableDia.cpp
@@ -70,9 +70,9 @@ void KWTablePreview::paintEvent( TQPaintEvent * )
 /* Class: KWTableDia                                              */
 /******************************************************************/
 
-KWTableDia::KWTableDia( TQWidget* tqparent, const char* name, UseMode _useMode, KWCanvas *_canvas, KWDocument *_doc,
+KWTableDia::KWTableDia( TQWidget* parent, const char* name, UseMode _useMode, KWCanvas *_canvas, KWDocument *_doc,
         int rows, int cols, CellSize wid, CellSize hei, bool floating , const TQString & _templateName, int format)
-    : KDialogBase( Tabbed, i18n("Table Settings"), Ok | Cancel, Ok, tqparent, name, true)
+    : KDialogBase( Tabbed, i18n("Table Settings"), Ok | Cancel, Ok, parent, name, true)
 {
     m_useMode = _useMode;
     canvas = _canvas;
diff --git a/kword/KWTableDia.h b/kword/KWTableDia.h
index 0e6ad2d53..09dff25ad 100644
--- a/kword/KWTableDia.h
+++ b/kword/KWTableDia.h
@@ -74,7 +74,7 @@ class KWTableDia : public KDialogBase
 public:
     typedef int CellSize; // in fact KWTableFrameSet::CellSize, which is an enum
     enum UseMode{ NEW, EDIT };
-    KWTableDia( TQWidget *tqparent, const char *name, UseMode _useMode, KWCanvas *_canvas,
+    KWTableDia( TQWidget *parent, const char *name, UseMode _useMode, KWCanvas *_canvas,
             KWDocument *_doc, int rows, int cols, CellSize wid, CellSize hei, bool floating,
             const TQString & _templateName,  int format);
 
diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp
index 892bc822e..f108573b5 100644
--- a/kword/KWTableFrameSet.cpp
+++ b/kword/KWTableFrameSet.cpp
@@ -1904,7 +1904,7 @@ void KWTableFrameSet::loadOasis( const TQDomElement& tableTag, KoOasisContext& c
     parseInsideOfTable( tableTag, context, columnLefts, row, column, 0 );
 }
 
-void KWTableFrameSet::parseInsideOfTable( const TQDomElement& tqparent, KoOasisContext& context,
+void KWTableFrameSet::parseInsideOfTable( const TQDomElement& parent, KoOasisContext& context,
                                           const TQMemArray<double> & columnLefts, uint& row, uint& column,
                                           double currentRowHeight )
 {
@@ -1912,7 +1912,7 @@ void KWTableFrameSet::parseInsideOfTable( const TQDomElement& tqparent, KoOasisC
     KoStyleStack& styleStack = context.styleStack();
 
     TQDomElement e;
-    forEachElement( e, tqparent )
+    forEachElement( e, parent )
     {
         const TQString localName = e.localName();
         const TQString ns = e.namespaceURI();
diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h
index d3f0ad31e..e379f3b6e 100644
--- a/kword/KWTableFrameSet.h
+++ b/kword/KWTableFrameSet.h
@@ -525,7 +525,7 @@ protected:
 private:
     void addCellToArray( Cell* cell );
     void afterLoadingCell( Cell* cell );
-    void parseInsideOfTable( const TQDomElement& tqparent, KoOasisContext& context,
+    void parseInsideOfTable( const TQDomElement& parent, KoOasisContext& context,
                              const TQMemArray<double> & columnLefts, uint& row, uint& column,
                              double currentRowHeight );
     void loadOasisCell( const TQDomElement& element, KoOasisContext& context,
diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp
index 7bd70eb65..c7cd547a2 100644
--- a/kword/KWTableStyleManager.cpp
+++ b/kword/KWTableStyleManager.cpp
@@ -48,8 +48,8 @@
 /* Class: KWTableStylePreview                                     */
 /******************************************************************/
 
-KWTableStylePreview::KWTableStylePreview( const TQString& title, const TQString& text, TQWidget* tqparent, const char* name )
-    : TQGroupBox( title, tqparent, name )
+KWTableStylePreview::KWTableStylePreview( const TQString& title, const TQString& text, TQWidget* parent, const char* name )
+    : TQGroupBox( title, parent, name )
 {
     m_zoomHandler = new KoTextZoomHandler;
     TQFont font = KoGlobal::defaultFont();
diff --git a/kword/KWTableStyleManager.h b/kword/KWTableStyleManager.h
index 4d95ca755..a264b8a24 100644
--- a/kword/KWTableStyleManager.h
+++ b/kword/KWTableStyleManager.h
@@ -51,7 +51,7 @@ class KWTableStylePreview : public TQGroupBox
   TQ_OBJECT
 
 public:
-    KWTableStylePreview(const TQString &title, const TQString &text, TQWidget *tqparent, const char* name = 0);
+    KWTableStylePreview(const TQString &title, const TQString &text, TQWidget *parent, const char* name = 0);
     virtual ~KWTableStylePreview();
 
     void setTableStyle(KWTableStyle *_tableStyle);
diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp
index 7fd642e2c..c36743df4 100644
--- a/kword/KWTableTemplateSelector.cpp
+++ b/kword/KWTableTemplateSelector.cpp
@@ -50,8 +50,8 @@
 /* Class: KWTableTemplatePreview                                  */
 /******************************************************************/
 
-KWTableTemplatePreview::KWTableTemplatePreview( const TQString& title, KWTableStyle *_emptyStyle, TQWidget* tqparent, const char* name )
-    : TQGroupBox( title, tqparent, name )
+KWTableTemplatePreview::KWTableTemplatePreview( const TQString& title, KWTableStyle *_emptyStyle, TQWidget* parent, const char* name )
+    : TQGroupBox( title, parent, name )
 {
     m_emptyStyle = _emptyStyle;
     m_zoomHandler = new KoTextZoomHandler;
diff --git a/kword/KWTableTemplateSelector.h b/kword/KWTableTemplateSelector.h
index 43a6e3585..1bae479bf 100644
--- a/kword/KWTableTemplateSelector.h
+++ b/kword/KWTableTemplateSelector.h
@@ -56,7 +56,7 @@ class KWTableTemplatePreview : public TQGroupBox
   TQ_OBJECT
 
 public:
-    KWTableTemplatePreview( const TQString& title, KWTableStyle *_emptyStyle, TQWidget* tqparent, const char* name=0L );
+    KWTableTemplatePreview( const TQString& title, KWTableStyle *_emptyStyle, TQWidget* parent, const char* name=0L );
     ~KWTableTemplatePreview();
     void setTableTemplate(KWTableTemplate *_tableTemplate);
     KWTableTemplate *getTableTemplate()const ;
diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index c19da8f07..43a1de5a7 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -745,7 +745,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
         TQRegion reg;
         if ( hasFrames ) {
             reg = frameClipRegion( p, theFrame, clip, m_currentViewMode );
-            if ( !isFloating() ) // problem with multitqparent inline frames
+            if ( !isFloating() ) // problem with multiparent inline frames
                 reg &= p->xForm( viewFrameRect );
         }
 
@@ -3323,10 +3323,10 @@ void KWTextFrameSetEdit::startDrag()
     }
 }
 
-TQDragObject * KWTextFrameSetEdit::newDrag( TQWidget * tqparent )
+TQDragObject * KWTextFrameSetEdit::newDrag( TQWidget * parent )
 {
     KWTextFrameSet* fs = textFrameSet();
-    return fs->kWordDocument()->dragSelected( tqparent, fs );
+    return fs->kWordDocument()->dragSelected( parent, fs );
 }
 
 void KWTextFrameSetEdit::ensureCursorVisible()
diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h
index 58b7730eb..ef83a3c8e 100644
--- a/kword/KWTextFrameSet.h
+++ b/kword/KWTextFrameSet.h
@@ -498,7 +498,7 @@ protected:
     virtual bool textDecreaseIndent();
 
     virtual void startDrag();
-    TQDragObject * newDrag( TQWidget * tqparent );
+    TQDragObject * newDrag( TQWidget * parent );
 
 private slots:
     void slotFrameDeleted(KWFrame *);
diff --git a/kword/KWTextImage.cpp b/kword/KWTextImage.cpp
index 981ce1cb5..440315730 100644
--- a/kword/KWTextImage.cpp
+++ b/kword/KWTextImage.cpp
@@ -53,7 +53,7 @@ void KWTextImage::resize()
     if ( m_deleted )
         return;
     if ( !m_image.isNull() ) {
-        //KWDocument * doc = static_cast<KWTextDocument *>(tqparent)->textFrameSet()->kWordDocument();
+        //KWDocument * doc = static_cast<KWTextDocument *>(parent)->textFrameSet()->kWordDocument();
         width = m_image.getOriginalSize().width();
         // width is a 100%-zoom pixel size. We want a LU pixel size -> we simply need 'to LU', i.e. ptToLayoutPt
         width = KoTextZoomHandler::ptToLayoutUnitPt( width );
@@ -98,7 +98,7 @@ void KWTextImage::drawCustomItem( TQPainter* p, int x, int y, int wpix, int hpix
 void KWTextImage::save( TQDomElement & parentElem )
 {
     // This code is similar to KWPictureFrameSet::save
-    KWDocument * doc = static_cast<KWTextDocument *>(tqparent)->textFrameSet()->kWordDocument();
+    KWDocument * doc = static_cast<KWTextDocument *>(parent)->textFrameSet()->kWordDocument();
 
     TQDomElement imageElem = parentElem.ownerDocument().createElement( "PICTURE" );
     parentElem.appendChild( imageElem );
@@ -113,7 +113,7 @@ void KWTextImage::save( TQDomElement & parentElem )
 void KWTextImage::load( TQDomElement & parentElem )
 {
     // This code is similar to KWPictureFrameSet::load
-    KWDocument * doc = static_cast<KWTextDocument *>(tqparent)->textFrameSet()->kWordDocument();
+    KWDocument * doc = static_cast<KWTextDocument *>(parent)->textFrameSet()->kWordDocument();
 
     // <IMAGE> (KOffice 1.0) or <PICTURE> (KWord 1.2)
     TQDomNode node=parentElem.namedItem( "PICTURE" );
diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp
index 45fa37cda..5b82b220e 100644
--- a/kword/KWVariable.cpp
+++ b/kword/KWVariable.cpp
@@ -70,10 +70,10 @@ void KWVariableSettings::saveNoteConfiguration( KoXmlWriter& writer ) const
     writer.endElement();
 }
 
-void KWVariableSettings::loadNoteConfiguration( const TQDomElement& tqparent )
+void KWVariableSettings::loadNoteConfiguration( const TQDomElement& parent )
 {
     TQDomElement e;
-    forEachElement( e, tqparent )
+    forEachElement( e, parent )
     {
         if ( e.localName() == "notes-configuration" && e.namespaceURI() == KoXmlNS::text )
         {
diff --git a/kword/KWVariable.h b/kword/KWVariable.h
index e04459572..b61f24a6c 100644
--- a/kword/KWVariable.h
+++ b/kword/KWVariable.h
@@ -47,7 +47,7 @@ class KWVariableSettings : public KoVariableSettings
     virtual void save( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     void saveNoteConfiguration( KoXmlWriter& writer ) const;
-    void loadNoteConfiguration( const TQDomElement& tqparent );
+    void loadNoteConfiguration( const TQDomElement& parent );
     void changeFootNoteCounter( KoParagCounter _c );
     void changeEndNoteCounter( KoParagCounter _c );
     KoParagCounter endNoteCounter() const { return m_endNoteCounter;}
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index f23e634a7..fd31fff2f 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -224,8 +224,8 @@ class TableInfo {
 /******************************************************************/
 /* Class: KWView                                                  */
 /******************************************************************/
-KWView::KWView( const TQString& viewMode, TQWidget *tqparent, const char *name, KWDocument* doc )
-    : KoView( doc, tqparent, name )
+KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KWDocument* doc )
+    : KoView( doc, parent, name )
 {
     m_doc = doc;
     m_gui = 0;
@@ -5414,7 +5414,7 @@ void KWView::guiActivateEvent( KParts::GUIActivateEvent *ev )
     {
         initGui();
         if (m_doc->isEmbedded() ) {
-            // Get zoom level from KoView, i.e. from the tqparent view
+            // Get zoom level from KoView, i.e. from the parent view
             const int zoom = tqRound( KoView::zoom() * 100 );
             setZoom( zoom, true );
             showZoom( zoom );
@@ -7508,7 +7508,7 @@ KWFrameViewManager* KWView::frameViewManager() const {
 void KWView::deleteSelectedFrames() {
     int nbCommand=0;
 
-    int docItem=0; // bittqmask for changed doc items.
+    int docItem=0; // bitmask for changed doc items.
 
     KMacroCommand * macroCmd = new KMacroCommand( i18n("Delete Frames") );
     KWFrameViewManager *fvMgr = frameViewManager();
@@ -7568,8 +7568,8 @@ void KWView::deleteSelectedFrames() {
 /******************************************************************/
 /* Class: KWViewWidget                                            */
 /******************************************************************/
-KWViewWidget::KWViewWidget( TQWidget *tqparent, KWView *view )
-  : TQWidget( tqparent ),
+KWViewWidget::KWViewWidget( TQWidget *parent, KWView *view )
+  : TQWidget( parent ),
     m_view ( view )
 {
 }
@@ -7590,8 +7590,8 @@ void KWViewWidget::resizeEvent( TQResizeEvent *e )
 /******************************************************************/
 /* Class: KWGUI                                                */
 /******************************************************************/
-KWGUI::KWGUI( const TQString& viewMode, TQWidget *tqparent, KWView *daView )
-  : TQHBox( tqparent, "" ),
+KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView )
+  : TQHBox( parent, "" ),
     m_view ( daView )
 {
 
diff --git a/kword/KWView.h b/kword/KWView.h
index 581349780..f023e6c6d 100644
--- a/kword/KWView.h
+++ b/kword/KWView.h
@@ -98,7 +98,7 @@ class KWView : public KoView
   TQ_OBJECT
 
 public:
-    KWView( const TQString& viewMode, TQWidget *tqparent, const char *name, KWDocument *doc );
+    KWView( const TQString& viewMode, TQWidget *parent, const char *name, KWDocument *doc );
     virtual ~KWView();
 
     virtual DCOPObject* dcopObject();
@@ -822,7 +822,7 @@ class KWViewWidget : public TQWidget
   TQ_OBJECT
 
 public:
-    KWViewWidget( TQWidget *tqparent, KWView *view );
+    KWViewWidget( TQWidget *parent, KWView *view );
 
 protected:
     void resizeEvent( TQResizeEvent *e );
@@ -841,7 +841,7 @@ class KWGUI : public TQHBox
   TQ_OBJECT
 
 public:
-    KWGUI( const TQString& viewMode, TQWidget *tqparent, KWView *view );
+    KWGUI( const TQString& viewMode, TQWidget *parent, KWView *view );
 
     void showGUI();
 
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index af23925e4..1e6c20fee 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -46,8 +46,8 @@
  *
  ******************************************************************/
 
-KWClassicSerialDataSource::KWClassicSerialDataSource(KInstance *inst,TQObject *tqparent)
-	: KWMailMergeDataSource(inst,tqparent)
+KWClassicSerialDataSource::KWClassicSerialDataSource(KInstance *inst,TQObject *parent)
+	: KWMailMergeDataSource(inst,parent)
 //    : doc( doc_ )
 {
 }
@@ -113,10 +113,10 @@ void KWClassicSerialDataSource::removeRecord( int i )
     db.remove( it );
 }
 
-void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent)
+void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent)
 {
 	TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
-	tqparent.appendChild(def);
+	parent.appendChild(def);
 	for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 	{
 		TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
@@ -124,7 +124,7 @@ void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent
 		def.appendChild(defEnt);
 	}
 	TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
-	tqparent.appendChild(cont);
+	parent.appendChild(cont);
 	for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
 	{
 		TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
@@ -183,15 +183,15 @@ bool KWClassicSerialDataSource::showConfigDialog(TQWidget *par,int action)
  *
  ******************************************************************/
 
-KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *tqparent )
-    : TQListViewItem( tqparent )
+KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *parent )
+    : TQListViewItem( parent )
 {
     editWidget = new TQLineEdit( listView()->viewport() );
     listView()->addChild( editWidget );
 }
 
-KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *tqparent, TQListViewItem *after )
-    : TQListViewItem( tqparent, after )
+KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *parent, TQListViewItem *after )
+    : TQListViewItem( parent, after )
 {
     editWidget = new TQLineEdit( listView()->viewport() );
     listView()->addChild( editWidget );
@@ -238,8 +238,8 @@ void KWClassicMailMergeEditorListItem::update()
  *
  ******************************************************************/
 
-KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *tqparent, KWClassicSerialDataSource *db_ )
-    : TQListView( tqparent ), db( db_ )
+KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *parent, KWClassicSerialDataSource *db_ )
+    : TQListView( parent ), db( db_ )
 {
     setSorting( -1 );
     addColumn( i18n( "Name" ) );
@@ -329,8 +329,8 @@ void KWClassicMailMergeEditorList::displayRecord( int i )
  *
  ******************************************************************/
 
-KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *tqparent, KWClassicSerialDataSource *db_ )
-    : KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ )
+KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicSerialDataSource *db_ )
+    : KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true ), db( db_ )
 {
     back = plainPage();
 
@@ -561,9 +561,9 @@ void KWClassicMailMergeEditor::removeRecord()
 }
 
 extern "C" {
-	KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(KInstance *inst,TQObject *tqparent)
+	KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(KInstance *inst,TQObject *parent)
 	{
-		return new KWClassicSerialDataSource(inst,tqparent);
+		return new KWClassicSerialDataSource(inst,parent);
 	}
 
 }
diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h
index 43416b078..03e1ddb30 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.h
+++ b/kword/mailmerge/KWClassicSerialDataSource.h
@@ -48,7 +48,7 @@ class KWClassicSerialDataSource: public KWMailMergeDataSource
     Q_OBJECT
   TQ_OBJECT
     public:
-    KWClassicSerialDataSource(KInstance *inst,TQObject *tqparent);
+    KWClassicSerialDataSource(KInstance *inst,TQObject *parent);
     ~KWClassicSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
@@ -81,8 +81,8 @@ class KWClassicSerialDataSource: public KWMailMergeDataSource
 class KWClassicMailMergeEditorListItem : public TQListViewItem
 {
 public:
-    KWClassicMailMergeEditorListItem( TQListView *tqparent );
-    KWClassicMailMergeEditorListItem( TQListView *tqparent, TQListViewItem *after );
+    KWClassicMailMergeEditorListItem( TQListView *parent );
+    KWClassicMailMergeEditorListItem( TQListView *parent, TQListViewItem *after );
     virtual ~KWClassicMailMergeEditorListItem();
 
     virtual void setText( int i, const TQString &text );
@@ -107,7 +107,7 @@ class KWClassicMailMergeEditorList : public TQListView
   TQ_OBJECT
 
 public:
-    KWClassicMailMergeEditorList( TQWidget *tqparent, KWClassicSerialDataSource *db_ );
+    KWClassicMailMergeEditorList( TQWidget *parent, KWClassicSerialDataSource *db_ );
     virtual ~KWClassicMailMergeEditorList();
 
     void invalidateCurrentRecord();
@@ -140,7 +140,7 @@ class KWClassicMailMergeEditor : public KDialogBase
   TQ_OBJECT
 
 public:
-    KWClassicMailMergeEditor( TQWidget *tqparent, KWClassicSerialDataSource *db_ );
+    KWClassicMailMergeEditor( TQWidget *parent, KWClassicSerialDataSource *db_ );
 
 protected:
     void resizeEvent( TQResizeEvent *e );
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 855611f51..411ee5e57 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -33,8 +33,8 @@
 #include "KWMailMergeKABC.h"
 #include "KWMailMergeKABCConfig.h"
 
-KWMailMergeKABC::KWMailMergeKABC( KInstance *inst, TQObject *tqparent )
-        : KWMailMergeDataSource( inst, tqparent )
+KWMailMergeKABC::KWMailMergeKABC( KInstance *inst, TQObject *parent )
+        : KWMailMergeDataSource( inst, parent )
 {
     _addressBook = KABC::StdAddressBook::self();
     _iterator = _addressBook->begin();
@@ -480,10 +480,10 @@ void KWMailMergeKABC::refresh( bool )
 }
 
 
-void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& tqparent)
+void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent)
 {
     TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
-    tqparent.appendChild(cont);
+    parent.appendChild(cont);
 
     TQValueList<TQString>::ConstIterator it = _individualUIDs.begin();
     for( ; it != _individualUIDs.end(); ++it )
@@ -537,9 +537,9 @@ TQStringList KWMailMergeKABC::singleRecords() const
 
 extern "C"
 {
-    KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( KInstance *inst, TQObject *tqparent )
+    KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( KInstance *inst, TQObject *parent )
     {
-        return new KWMailMergeKABC( inst, tqparent );
+        return new KWMailMergeKABC( inst, parent );
     }
 }
 
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h
index f27541170..0c40f47d7 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.h
@@ -36,7 +36,7 @@ class KWMailMergeKABC: public KWMailMergeDataSource
   TQ_OBJECT
 
 public:
-    KWMailMergeKABC( KInstance *inst, TQObject *tqparent );
+    KWMailMergeKABC( KInstance *inst, TQObject *parent );
     ~KWMailMergeKABC();
 
     /**
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
index 508eb74f0..d1c038099 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
@@ -39,9 +39,9 @@
 #include "KWMailMergeKABCConfig.h"
 
 
-KWMailMergeKABCConfig::KWMailMergeKABCConfig( TQWidget *tqparent, KWMailMergeKABC *db_)
+KWMailMergeKABCConfig::KWMailMergeKABCConfig( TQWidget *parent, KWMailMergeKABC *db_)
         :KDialogBase( Plain, i18n( "Mail Merge - Editor" ),
-                      Ok | Cancel, Ok, tqparent, "", true)
+                      Ok | Cancel, Ok, parent, "", true)
 {
     _db = db_;
 
@@ -119,7 +119,7 @@ void KWMailMergeKABCConfig::addSelectedContacts()
                     destroyAvailableClones( uid );
                 }
             }
-            else if( it.current()->tqparent()->text(0) == i18n("Distribution Lists") )
+            else if( it.current()->parent()->text(0) == i18n("Distribution Lists") )
             {
                 if( selectedLists )
                 {
@@ -336,7 +336,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item )
             }
             delete item;
         }
-        else if( item->tqparent()->text(0) == i18n("Distribution Lists") ) // remove a list
+        else if( item->parent()->text(0) == i18n("Distribution Lists") ) // remove a list
         {
             if( availableLists )
                 availableLists->insertItem( item );
@@ -509,15 +509,15 @@ void KWMailMergeKABCConfig::updateAvailable()
 
 
 
-KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListView *tqparent,
-        const KABC::Addressee& addressEntry ) : TQListViewItem( tqparent )
+KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListView *parent,
+        const KABC::Addressee& addressEntry ) : TQListViewItem( parent )
 {
     setText( 0, addressEntry.formattedName() );
     _addressEntry = addressEntry;
 }
 
-KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListViewItem *tqparent,
-        const KABC::Addressee& addressEntry ) : TQListViewItem( tqparent )
+KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListViewItem *parent,
+        const KABC::Addressee& addressEntry ) : TQListViewItem( parent )
 {
     setText( 0, addressEntry.formattedName() );
     _addressEntry = addressEntry;
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
index 32fe74cd3..0d0240f1e 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
@@ -36,7 +36,7 @@ class KWMailMergeKABCConfig: public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWMailMergeKABCConfig( TQWidget *tqparent, KWMailMergeKABC *db_ );
+    KWMailMergeKABCConfig( TQWidget *parent, KWMailMergeKABC *db_ );
     virtual ~KWMailMergeKABCConfig();
 
 
@@ -58,7 +58,7 @@ private slots:
     void launchAddressbook() const;
 
     /**
-       Updates the tqparent's mail merge list from items in the right Listview.
+       Updates the parent's mail merge list from items in the right Listview.
      */
     void acceptSelection();
 
@@ -126,8 +126,8 @@ class KWMailMergeKABCConfigListItem : public TQListViewItem
 {
 
 public:
-    KWMailMergeKABCConfigListItem( TQListView *tqparent, const KABC::Addressee& addressEntry );
-    KWMailMergeKABCConfigListItem( TQListViewItem *tqparent, const KABC::Addressee& addressEntry );
+    KWMailMergeKABCConfigListItem( TQListView *parent, const KABC::Addressee& addressEntry );
+    KWMailMergeKABCConfigListItem( TQListViewItem *parent, const KABC::Addressee& addressEntry );
     virtual ~KWMailMergeKABCConfigListItem();
 
     /**
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index e48fbf349..6801a64a0 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -29,8 +29,8 @@
 
 using namespace KSpread;
 
-KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *tqparent )
-  : KWMailMergeDataSource( instance, tqparent ), _spreadSheetNumber( 1 )
+KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *parent )
+  : KWMailMergeDataSource( instance, parent ), _spreadSheetNumber( 1 )
 {
 }
 
@@ -72,10 +72,10 @@ void KWMailMergeKSpread::load( TQDomElement& parentElem )
   initDocument();
 }
 
-void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& tqparent )
+void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& parent )
 {
   TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) );
-  tqparent.appendChild( content );
+  parent.appendChild( content );
 
   content.setAttribute( "URL", _url.url() );
   content.setAttribute( "SpreadSheetNumber", _spreadSheetNumber );
@@ -85,9 +85,9 @@ void KWMailMergeKSpread::refresh( bool )
 {
 }
 
-bool KWMailMergeKSpread::showConfigDialog( TQWidget *tqparent, int )
+bool KWMailMergeKSpread::showConfigDialog( TQWidget *parent, int )
 {
-  KWMailMergeKSpreadConfig dlg( tqparent, this );
+  KWMailMergeKSpreadConfig dlg( parent, this );
 
   int retval = dlg.exec();
   if ( retval )
@@ -202,9 +202,9 @@ TQString KWMailMergeKSpread::cellText( const Cell *cell ) const
 
 extern "C"
 {
-  KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *tqparent )
+  KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *parent )
   {
-    return new KWMailMergeKSpread( instance, tqparent );
+    return new KWMailMergeKSpread( instance, parent );
   }
 }
 
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.h b/kword/mailmerge/kspread/kwmailmerge_kspread.h
index 2b039c01a..e5b1bb2fa 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.h
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.h
@@ -35,7 +35,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource
   TQ_OBJECT
 
   public:
-    KWMailMergeKSpread( KInstance *inst, TQObject *tqparent );
+    KWMailMergeKSpread( KInstance *inst, TQObject *parent );
     ~KWMailMergeKSpread();
 
     /**
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
index 00f1ba203..f08ae82e2 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
@@ -34,9 +34,9 @@
 
 using namespace KSpread;
 
-KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( TQWidget *tqparent, KWMailMergeKSpread *object )
+KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( TQWidget *parent, KWMailMergeKSpread *object )
   : KDialogBase( Plain, i18n( "Mail Merge - Editor" ),
-                 Ok | Cancel, Ok, tqparent, "", true ),
+                 Ok | Cancel, Ok, parent, "", true ),
     _document( 0 ), _initialPage( 1 )
 {
   _object = object;
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.h b/kword/mailmerge/kspread/kwmailmerge_kspread_config.h
index 31706e761..21d6206e8 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.h
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.h
@@ -36,7 +36,7 @@ class KWMailMergeKSpreadConfig: public KDialogBase
   TQ_OBJECT
 
   public:
-    KWMailMergeKSpreadConfig( TQWidget *tqparent, KWMailMergeKSpread *object );
+    KWMailMergeKSpreadConfig( TQWidget *parent, KWMailMergeKSpread *object );
     virtual ~KWMailMergeKSpreadConfig();
 
 
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
index aec361a34..3db1d9d6f 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
@@ -6,8 +6,8 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *tqparent)
-        :KDialogBase( Swallow, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true)
+KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent)
+        :KDialogBase( Swallow, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true)
 {
        m_fieldList << "" <<"one" << "two" << "three" << "four";
        m_sortingList << ""<<i18n("ascending")<<i18n("descending");
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.h b/kword/mailmerge/sql/KWQtSqlEasyFilter.h
index 1384dec70..f95f46b3b 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.h
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.h
@@ -12,7 +12,7 @@ class KWQtSqlEasyFilter: public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-    KWQtSqlEasyFilter( TQWidget *tqparent);
+    KWQtSqlEasyFilter( TQWidget *parent);
     virtual ~KWQtSqlEasyFilter();
 protected:
     void createColumn(int i);
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
index 2518399bc..d3feca225 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
@@ -37,8 +37,8 @@
  *
  ******************************************************************/
 
-KWQtSqlMailMergeOpen::KWQtSqlMailMergeOpen( TQWidget *tqparent, KWQtSqlSerialDataSourceBase *db_ )
-        :KDialogBase( Plain, i18n( "Mail Merge - Setup Database Connection" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ ){
+KWQtSqlMailMergeOpen::KWQtSqlMailMergeOpen( TQWidget *parent, KWQtSqlSerialDataSourceBase *db_ )
+        :KDialogBase( Plain, i18n( "Mail Merge - Setup Database Connection" ), Ok | Cancel, Ok, parent, "", true ), db( db_ ){
         (new TQVBoxLayout(plainPage()))->setAutoAdd(true);
         setMainWidget(widget=new KWQtSqlOpenWidget(plainPage()));
         widget->drivers->insertStringList(TQSqlDatabase::drivers());
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h
index 949dc2c6a..39430517c 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h
@@ -39,7 +39,7 @@ class KWQtSqlMailMergeOpen : public KDialogBase
   TQ_OBJECT
 
 public:
-    KWQtSqlMailMergeOpen( TQWidget *tqparent, KWQtSqlSerialDataSourceBase *db_ );
+    KWQtSqlMailMergeOpen( TQWidget *parent, KWQtSqlSerialDataSourceBase *db_ );
     ~KWQtSqlMailMergeOpen();
 private:
  KWQtSqlSerialDataSourceBase *db;
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index c091184e9..bbaf97d69 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -41,8 +41,8 @@
  *
  ******************************************************************/
 
-KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *tqparent)
-	: KWQtSqlSerialDataSourceBase(inst,tqparent),myquery(0)
+KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent)
+	: KWQtSqlSerialDataSourceBase(inst,parent),myquery(0)
 {
 	port=i18n("default");
 }
@@ -83,10 +83,10 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor
 	return (myquery->value(name)).toString();
 }
 
-void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent)
+void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent)
 {
         TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
-        tqparent.appendChild(def);
+        parent.appendChild(def);
         {
                 TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("DATABASE"));
                 defEnt.setAttribute(TQString::tqfromLatin1("hostname"),hostname);
@@ -101,7 +101,7 @@ void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqpar
 		def.appendChild(defEnt);
 
 		TQDomElement sampleEnt=doc.createElement(TQString::tqfromLatin1("SAMPLERECORD"));
-		tqparent.appendChild(sampleEnt);
+		parent.appendChild(sampleEnt);
 	        for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
         	{
                 	TQDomElement fieldEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
@@ -175,8 +175,8 @@ void KWQtSqlPowerSerialDataSource::addSampleRecordEntry(TQString name)
  *
  ******************************************************************/
 
-KWQtSqlPowerMailMergeEditor::KWQtSqlPowerMailMergeEditor( TQWidget *tqparent, KWQtSqlPowerSerialDataSource *db_ )
-	:KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ )
+KWQtSqlPowerMailMergeEditor::KWQtSqlPowerMailMergeEditor( TQWidget *parent, KWQtSqlPowerSerialDataSource *db_ )
+	:KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true ), db( db_ )
 {
         (new TQVBoxLayout(plainPage()))->setAutoAdd(true);
         setMainWidget(widget=new KWQtSqlPowerWidget(plainPage()));
@@ -249,8 +249,8 @@ KWQtSqlPowerMailMergeEditor::~KWQtSqlPowerMailMergeEditor(){;}
 
 
 extern "C" {
-        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(KInstance *inst,TQObject *tqparent)
+        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(KInstance *inst,TQObject *parent)
         {
-                return new KWQtSqlPowerSerialDataSource(inst,tqparent);
+                return new KWQtSqlPowerSerialDataSource(inst,parent);
         }
 }
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
index 6870afe16..3d3643382 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
@@ -47,7 +47,7 @@ class KWQtSqlPowerSerialDataSource: public KWQtSqlSerialDataSourceBase
     Q_OBJECT
 //    TQ_OBJECT
     public:
-    KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *tqparent);
+    KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent);
     ~KWQtSqlPowerSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
@@ -81,7 +81,7 @@ class KWQtSqlPowerMailMergeEditor : public KDialogBase
 //    TQ_OBJECT
 
 public:
-    KWQtSqlPowerMailMergeEditor( TQWidget *tqparent, KWQtSqlPowerSerialDataSource *db_ );
+    KWQtSqlPowerMailMergeEditor( TQWidget *parent, KWQtSqlPowerSerialDataSource *db_ );
     ~KWQtSqlPowerMailMergeEditor();
 private:
  KWQtSqlPowerSerialDataSource *db;
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 45ff85bc4..ec31df358 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -38,8 +38,8 @@
  *
  ******************************************************************/
 
-KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(KInstance *inst,TQObject *tqparent)
-	: KWQtSqlSerialDataSourceBase(inst,tqparent)
+KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent)
+	: KWQtSqlSerialDataSourceBase(inst,parent)
 {
   myquery=0;
 }
@@ -63,11 +63,11 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c
         return (myquery->value(name)).toString();
 }
 
-void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*tqparent*/)
+void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*parent*/)
 {
 /*
 	TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
-	tqparent.appendChild(def);
+	parent.appendChild(def);
 	for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 	{
 		TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
@@ -75,7 +75,7 @@ void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*tq
 		def.appendChild(defEnt);
 	}
 	TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
-	tqparent.appendChild(cont);
+	parent.appendChild(cont);
 	for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
 	{
 		TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
@@ -162,8 +162,8 @@ void KWQtSqlSerialDataSource::refresh(bool force)
 
 
 
-KWQtSqlDataSourceEditor::KWQtSqlDataSourceEditor( TQWidget *tqparent, KWQtSqlSerialDataSource *db_ )
-        :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ )
+KWQtSqlDataSourceEditor::KWQtSqlDataSourceEditor( TQWidget *parent, KWQtSqlSerialDataSource *db_ )
+        :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true ), db( db_ )
 {
 	tableName=db->tableName;
 	filter=db->filter;
@@ -206,13 +206,13 @@ void KWQtSqlDataSourceEditor::slotSetQuery()
 
 void KWQtSqlDataSourceEditor::editFilter()
 {
-	KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(TQT_TQWIDGET(tqparent()));
+	KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(TQT_TQWIDGET(parent()));
 	f->exec();
 }
 
 extern "C" {
-        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,TQObject *tqparent)
+        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,TQObject *parent)
         {
-                return new KWQtSqlSerialDataSource(inst,tqparent);
+                return new KWQtSqlSerialDataSource(inst,parent);
         }
 }
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
index cc6061a97..ed25b4ee5 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
@@ -36,7 +36,7 @@
 class KWQtSqlSerialDataSource: public KWQtSqlSerialDataSourceBase
 {
     public:
-    KWQtSqlSerialDataSource(KInstance *inst,TQObject *tqparent);
+    KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent);
     ~KWQtSqlSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
@@ -67,7 +67,7 @@ class KWQtSqlDataSourceEditor : public KDialogBase
   TQ_OBJECT
 
 public:
-    KWQtSqlDataSourceEditor( TQWidget *tqparent, KWQtSqlSerialDataSource *db_ );
+    KWQtSqlDataSourceEditor( TQWidget *parent, KWQtSqlSerialDataSource *db_ );
     ~KWQtSqlDataSourceEditor(){;}
 private:
   KWQtSqlSerialDataSource *db;
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index 040c657eb..f31a431a6 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -46,10 +46,10 @@
 
 int KWQtSqlSerialDataSourceBase::connectionId=0;
 
-KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *tqparent)
-	: KWMailMergeDataSource(inst,tqparent)
+KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent)
+	: KWMailMergeDataSource(inst,parent)
 {
-	DataBaseConnection=TQString("KWTQTSQLPOWER")+tqparent->name()+TQString("--%1").tqarg(connectionId++);
+	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").tqarg(connectionId++);
 	port=i18n("default");
 }
 
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
index ee4e02a82..1f3e43966 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
@@ -41,7 +41,7 @@ class KWQtSqlSerialDataSourceBase: public KWMailMergeDataSource
 //    TQ_OBJECT
     K_DCOP
     public:
-    KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *tqparent);
+    KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent);
     ~KWQtSqlSerialDataSourceBase();
 
    virtual bool showConfigDialog(TQWidget *par,int action);
diff --git a/lib/kformula/DESIGN b/lib/kformula/DESIGN
index fc404921a..3402d9ee8 100644
--- a/lib/kformula/DESIGN
+++ b/lib/kformula/DESIGN
@@ -20,15 +20,15 @@ Responsebilities
 (This goes for every derived element and therefore for each one.)
 
 - knows its tqchildren. Actually BasicElement doesn't have any. But it
-  already defines that tqchildren must be known by their tqparent.
+  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 tqparent.)
+  in this rect. (The position is relative to the parent.)
 //- knows its middle line. (for tqalignment)
 - knows it's zero point for midline (vertical tqalignment) and 
   keep open the possibility of negative positions (out of bounding rect)
 - draws itself (given a painter); tqchildren are drawn, too
 - knows all positions where the cursor is allowed to be. (see below)
-- knows its tqparent; The topmost element has no tqparent; there is a
+- 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)
@@ -62,11 +62,11 @@ between parenthesis" i.e. as content child of a delimiterelement)
 FormulaElement from SequenceElement
 --------------
 
-The only element those tqparent is null. The root of the element object
+The only element those parent is null. The root of the element object
 tree.
 
 This is the element that is created by the KFormulaDoc and that knows
-about it. As every other element knows its tqparent and therefore the
+about it. As every other element knows its parent and therefore the
 FormulaElement we get a chance to pass messages to the outside world.
 
 
@@ -129,7 +129,7 @@ GeometryElement from BasicElement
 ---------------
 
 One child.
-Draw it at a fixed position relative to tqparent or absolute.
+Draw it at a fixed position relative to parent or absolute.
 This is to do dirty things.
 
 This element must not be used, kformula will provide you everything
@@ -193,9 +193,9 @@ before, between and after its tqchildren, too.
 
 - 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 tqparent.
+cursor. If there is child left the cursor is passed to the parent.
 
-- If the cursor comes from our tqparent the first or the last child gets
+- If the cursor comes from our parent the first or the last child gets
 it. Depending on the direction in which the cursor moved.
 
 Please note that because each element knows its own cursor positions
diff --git a/lib/kformula/MatrixDialog.cc b/lib/kformula/MatrixDialog.cc
index a0536c1d3..c8169f240 100644
--- a/lib/kformula/MatrixDialog.cc
+++ b/lib/kformula/MatrixDialog.cc
@@ -30,8 +30,8 @@ KFORMULA_NAMESPACE_BEGIN
 const int DEFAULT_SIZE = 3;
 const int MAX_SIZE = 200;
 
-MatrixDialog::MatrixDialog( TQWidget *tqparent, int _width, int _height )
-        : KDialogBase(tqparent, "Matrix Dialog", true,i18n("Add Matrix"),Ok|Cancel)
+MatrixDialog::MatrixDialog( TQWidget *parent, int _width, int _height )
+        : KDialogBase(parent, "Matrix Dialog", true,i18n("Add Matrix"),Ok|Cancel)
 {
     w = _width;
     h = _height;
diff --git a/lib/kformula/MatrixDialog.h b/lib/kformula/MatrixDialog.h
index 06688b903..62e104c96 100644
--- a/lib/kformula/MatrixDialog.h
+++ b/lib/kformula/MatrixDialog.h
@@ -41,7 +41,7 @@ public:
     int w;
     int h;
 
-    MatrixDialog( TQWidget *tqparent, int width = 3, int height = 3 );
+    MatrixDialog( TQWidget *parent, int width = 3, int height = 3 );
     ~MatrixDialog() {}
 
 protected slots:
diff --git a/lib/kformula/actionelement.cc b/lib/kformula/actionelement.cc
index 5fa5a38e2..d4ef8ec42 100644
--- a/lib/kformula/actionelement.cc
+++ b/lib/kformula/actionelement.cc
@@ -22,7 +22,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-ActionElement::ActionElement( BasicElement* tqparent ) : SequenceElement( tqparent ),
+ActionElement::ActionElement( BasicElement* parent ) : SequenceElement( parent ),
                                                        m_selection( 0 )
 {
 }
diff --git a/lib/kformula/actionelement.h b/lib/kformula/actionelement.h
index 9c7342d54..09c4d0abe 100644
--- a/lib/kformula/actionelement.h
+++ b/lib/kformula/actionelement.h
@@ -32,7 +32,7 @@ KFORMULA_NAMESPACE_BEGIN
 class ActionElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
-    ActionElement( BasicElement* tqparent = 0 );
+    ActionElement( BasicElement* parent = 0 );
 	virtual int buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDomNode n);
 
 private:
diff --git a/lib/kformula/basicelement.cc b/lib/kformula/basicelement.cc
index 1d36193ac..096814aad 100644
--- a/lib/kformula/basicelement.cc
+++ b/lib/kformula/basicelement.cc
@@ -34,7 +34,7 @@ using namespace std;
 int BasicElement::evilDestructionCount = 0;
 
 BasicElement::BasicElement( BasicElement* p )
-        : tqparent( p ), m_baseline( 0 ), elementType( 0 )
+        : parent( p ), m_baseline( 0 ), elementType( 0 )
 {
     setX( 0 );
     setY( 0 );
@@ -49,7 +49,7 @@ BasicElement::~BasicElement()
 }
 
 BasicElement::BasicElement( const BasicElement& other )
-    : tqparent( 0 ),
+    : parent( 0 ),
       m_baseline( other.m_baseline ),
       elementType( other.elementType )
 {
@@ -63,14 +63,14 @@ BasicElement::BasicElement( const BasicElement& other )
 
 bool BasicElement::readOnly( const BasicElement* /*child*/ ) const
 {
-    return tqparent->readOnly( this );
+    return parent->readOnly( this );
 }
 
 
 FormulaElement* BasicElement::formula()
 {
-    //if ( tqparent != 0 ) {
-        return tqparent->formula();
+    //if ( parent != 0 ) {
+        return parent->formula();
         //}
         //return 0;
 }
@@ -99,7 +99,7 @@ LuPixelPoint BasicElement::widgetPos()
 {
     luPixel x = 0;
     luPixel y = 0;
-    for (BasicElement* element = this; element != 0; element = element->tqparent) {
+    for (BasicElement* element = this; element != 0; element = element->parent) {
         x += element->getX();
         y += element->getY();
     }
@@ -174,12 +174,12 @@ TQDomElement BasicElement::getElementDom( TQDomDocument& doc)
 }
 
 
-void BasicElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const
+void BasicElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const
 {
     TQDomElement de = doc.createElement( oasisFormat ? "math:" + getElementName() : getElementName() );
     writeMathMLAttributes( de );
     writeMathMLContent( doc, de, oasisFormat );
-    tqparent.appendChild( de );
+    parent.appendChild( de );
 }
 
 bool BasicElement::buildFromDom(TQDomElement element)
diff --git a/lib/kformula/basicelement.h b/lib/kformula/basicelement.h
index 025dfbc6d..1fe46cc11 100644
--- a/lib/kformula/basicelement.h
+++ b/lib/kformula/basicelement.h
@@ -87,7 +87,7 @@ public:
      * (The SequenceElement's tqchildren are simply counted.)
      */
 
-    BasicElement(BasicElement* tqparent = 0);
+    BasicElement(BasicElement* parent = 0);
     virtual ~BasicElement();
 
     // deep copy
@@ -102,7 +102,7 @@ public:
 
     /**
      * @returns whether the child should be read-only. The idea is
-     * that a read-only tqparent has read-only tqchildren.
+     * that a read-only parent has read-only tqchildren.
      */
     virtual bool readOnly( const BasicElement* child ) const;
 
@@ -114,7 +114,7 @@ public:
     /**
      * Provide fast access to the rootElement for each child.
      */
-    virtual const FormulaElement* formula() const { return tqparent->formula(); }
+    virtual const FormulaElement* formula() const { return parent->formula(); }
 
     /**
      * @returns the character that represents this element. Used for
@@ -167,7 +167,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -340,9 +340,9 @@ public:
 
     // basic support
 
-    const BasicElement* getParent() const { return tqparent; }
-    BasicElement* getParent() { return tqparent; }
-    void setParent(BasicElement* p) { tqparent = p; }
+    const BasicElement* getParent() const { return parent; }
+    BasicElement* getParent() { return parent; }
+    void setParent(BasicElement* p) { parent = p; }
 
     luPixel getX() const { return m_x; }
     luPixel getY() const { return m_y; }
@@ -377,7 +377,7 @@ public:
      * Same as above, just MathML.
      * It shouldn't be redefined but for exceptional cases, use the general writeMathML* API instead
      */
-    virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ;
+    virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ;
 
     /**
      * Set this element attribute, build tqchildren and
@@ -396,7 +396,7 @@ public:
     static int getEvilDestructionCount() { return evilDestructionCount; }
 
     /**
-     * @returns our type. This is an object from our tqparent's syntax tree
+     * @returns our type. This is an object from our parent's syntax tree
      * or 0 if there was a very bad parsing error.
      */
     ElementType* getElementType() const { return elementType; }
@@ -495,11 +495,11 @@ private:
     double str2size( const TQString& str, SizeType* st, uint index, SizeType type );
 
     /**
-     * Our tqparent.
-     * The tqparent might not be null except for the FormulaElement
+     * Our parent.
+     * The parent might not be null except for the FormulaElement
      * that is the top of the element tree.
      */
-    BasicElement* tqparent;
+    BasicElement* parent;
 
     /**
      * This elements size.
@@ -509,7 +509,7 @@ private:
     luPixel m_height;
 
     /**
-     * Our position relative to our tqparent.
+     * Our position relative to our parent.
      */
     //KoPoint position;
     luPixel m_x;
diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cc
index 0a599dc03..df51ffa83 100644
--- a/lib/kformula/bracketelement.cc
+++ b/lib/kformula/bracketelement.cc
@@ -35,8 +35,8 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-SingleContentElement::SingleContentElement(BasicElement* tqparent )
-    : BasicElement( tqparent )
+SingleContentElement::SingleContentElement(BasicElement* parent )
+    : BasicElement( parent )
 {
     content = new SequenceElement( this );
 }
@@ -137,9 +137,9 @@ void SingleContentElement::remove( FormulaCursor* cursor,
 {
     switch (cursor->getPos()) {
     case contentPos:
-        BasicElement* tqparent = getParent();
-        tqparent->selectChild(cursor, this);
-        tqparent->remove(cursor, removedChildren, direction);
+        BasicElement* parent = getParent();
+        parent->selectChild(cursor, this);
+        parent->remove(cursor, removedChildren, direction);
     }
 }
 
@@ -213,8 +213,8 @@ void SingleContentElement::writeMathMLContent( TQDomDocument& doc, TQDomElement&
 
 
 
-BracketElement::BracketElement(SymbolType l, SymbolType r, BasicElement* tqparent)
-    : SingleContentElement(tqparent),
+BracketElement::BracketElement(SymbolType l, SymbolType r, BasicElement* parent)
+    : SingleContentElement(parent),
       left( 0 ), right( 0 ),
       leftType( l ), rightType( r ),
       m_operator( false ), m_customLeft( false ), m_customRight( false )
@@ -361,7 +361,7 @@ void BracketElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void BracketElement::draw( TQPainter& painter, const LuPixelRect& r,
@@ -522,7 +522,7 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node)
     if ( m_operator ) {
         node = node.parentNode();
         TQDomNode open = node;
-        TQDomNode tqparent = node.parentNode();
+        TQDomNode parent = node.parentNode();
         if ( ! operatorType( node, true ) )
             return -1;
         int nodeNum = searchOperator( node );
@@ -548,7 +548,7 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node)
                 de.appendChild( node.toElement() );
                 node = n;
             } while ( ++i < nodeNum );
-            tqparent.insertAfter( de, open );
+            parent.insertAfter( de, open );
             node = de;
             kdWarning() << doc.toString() << endl;
         }
@@ -563,8 +563,8 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node)
             next = next.nextSibling();
         if ( ! next.isNull()) {
             TQDomDocument doc = node.ownerDocument();
-            TQDomNode tqparent = node.parentNode();
-            TQString ns = tqparent.prefix();
+            TQDomNode parent = node.parentNode();
+            TQString ns = parent.prefix();
             TQDomElement de = doc.createElementNS( ns, "mrow" );
             uint pos = 0;
             while ( ! node.isNull() ) {
@@ -590,8 +590,8 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node)
                 }
                 node = no;
             }
-            tqparent.appendChild( de );
-            node = tqparent.firstChild();
+            parent.appendChild( de );
+            node = parent.firstChild();
             while ( ! node.isElement() )
                 node = node.nextSibling();
         }
@@ -797,8 +797,8 @@ void BracketElement::writeMathMLAttributes( TQDomElement& element ) const
     }
 }
 
-OverlineElement::OverlineElement( BasicElement* tqparent )
-    : SingleContentElement( tqparent )
+OverlineElement::OverlineElement( BasicElement* parent )
+    : SingleContentElement( parent )
 {
 }
 
@@ -887,7 +887,7 @@ TQString OverlineElement::formulaString()
     return getContent()->formulaString();
 }
 
-void OverlineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const
+void OverlineElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const
 {
     TQDomElement de = doc.createElement( oasisFormat ? "math:mover" : "mover" );
     SingleContentElement::writeMathML( doc, de, oasisFormat );
@@ -895,12 +895,12 @@ void OverlineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool
     // is this the right entity? Mozilla renders it correctly.
     op.appendChild( doc.createEntityReference( "OverBar" ) );
     de.appendChild( op );
-    tqparent.appendChild( de );
+    parent.appendChild( de );
 }
 
 
-UnderlineElement::UnderlineElement( BasicElement* tqparent )
-    : SingleContentElement( tqparent )
+UnderlineElement::UnderlineElement( BasicElement* parent )
+    : SingleContentElement( parent )
 {
 }
 
@@ -991,7 +991,7 @@ TQString UnderlineElement::formulaString()
     return getContent()->formulaString();
 }
 
-void UnderlineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const
+void UnderlineElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const
 {
     TQDomElement de = doc.createElement( oasisFormat ? "math:munder" : "munder" );
     SingleContentElement::writeMathML( doc, de, oasisFormat );
@@ -999,7 +999,7 @@ void UnderlineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, boo
     // is this the right entity? Mozilla renders it correctly.
     op.appendChild( doc.createEntityReference( "UnderBar" ) );
     de.appendChild( op );
-    tqparent.appendChild( de );
+    parent.appendChild( de );
 }
 
 KFORMULA_NAMESPACE_END
diff --git a/lib/kformula/bracketelement.h b/lib/kformula/bracketelement.h
index eb0e2613e..83879aaca 100644
--- a/lib/kformula/bracketelement.h
+++ b/lib/kformula/bracketelement.h
@@ -40,7 +40,7 @@ class SingleContentElement : public BasicElement {
     SingleContentElement& operator=( const SingleContentElement& ) { return *this; }
 public:
 
-    SingleContentElement(BasicElement* tqparent = 0);
+    SingleContentElement(BasicElement* parent = 0);
     ~SingleContentElement();
 
     SingleContentElement( const SingleContentElement& );
@@ -166,7 +166,7 @@ public:
     enum { contentPos };
 
     BracketElement(SymbolType left = EmptyBracket, SymbolType right = EmptyBracket,
-                   BasicElement* tqparent = 0);
+                   BasicElement* parent = 0);
     ~BracketElement();
 
     BracketElement( const BracketElement& );
@@ -209,7 +209,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -303,7 +303,7 @@ class OverlineElement : public SingleContentElement {
     OverlineElement& operator=( const OverlineElement& ) { return *this; }
 public:
 
-    OverlineElement(BasicElement* tqparent = 0);
+    OverlineElement(BasicElement* parent = 0);
     ~OverlineElement();
 
     OverlineElement( const OverlineElement& );
@@ -331,7 +331,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -349,7 +349,7 @@ public:
 
     virtual TQString formulaString();
 
-    virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const;
+    virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const;
 
 protected:
 
@@ -370,7 +370,7 @@ private:
 class UnderlineElement : public SingleContentElement {
     UnderlineElement& operator=( const UnderlineElement& ) { return *this; }
 public:
-    UnderlineElement(BasicElement* tqparent = 0);
+    UnderlineElement(BasicElement* parent = 0);
     ~UnderlineElement();
 
     UnderlineElement( const UnderlineElement& );
@@ -398,7 +398,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -416,7 +416,7 @@ public:
 
     virtual TQString formulaString();
 
-    virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const;
+    virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const;
 
 protected:
 
diff --git a/lib/kformula/elementtype.h b/lib/kformula/elementtype.h
index 7fc441442..47db40fd6 100644
--- a/lib/kformula/elementtype.h
+++ b/lib/kformula/elementtype.h
@@ -61,7 +61,7 @@ public:
 
     /**
      * @returns the spanned text. seq must be the original
-     * tqparent sequence.
+     * parent sequence.
      */
     virtual TQString text( SequenceElement* seq ) const;
 
@@ -223,7 +223,7 @@ public:
 
     /**
      * @returns the spanned text. seq must be the original
-     * tqparent sequence.
+     * parent sequence.
      */
     virtual TQString text( SequenceElement* /*seq*/ ) const { return m_text; }
 
diff --git a/lib/kformula/encloseelement.cc b/lib/kformula/encloseelement.cc
index 05617361f..846f6bb2d 100644
--- a/lib/kformula/encloseelement.cc
+++ b/lib/kformula/encloseelement.cc
@@ -21,7 +21,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-EncloseElement::EncloseElement( BasicElement* tqparent ) : SequenceElement( tqparent ) {
+EncloseElement::EncloseElement( BasicElement* parent ) : SequenceElement( parent ) {
 }
 
 bool EncloseElement::readAttributesFromMathMLDom(const TQDomElement& element)
diff --git a/lib/kformula/encloseelement.h b/lib/kformula/encloseelement.h
index b6b16a0d7..758e32a48 100644
--- a/lib/kformula/encloseelement.h
+++ b/lib/kformula/encloseelement.h
@@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN
 class EncloseElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
-    EncloseElement( BasicElement* tqparent = 0 );
+    EncloseElement( BasicElement* parent = 0 );
 
 private:
     virtual bool readAttributesFromMathMLDom(const TQDomElement& element);
diff --git a/lib/kformula/errorelement.cc b/lib/kformula/errorelement.cc
index c63cf09c1..7a685f868 100644
--- a/lib/kformula/errorelement.cc
+++ b/lib/kformula/errorelement.cc
@@ -23,12 +23,12 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-ErrorElement::ErrorElement( BasicElement* tqparent ) : SequenceElement( tqparent ) {
+ErrorElement::ErrorElement( BasicElement* parent ) : SequenceElement( parent ) {
 }
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void ErrorElement::draw( TQPainter& painter, const LuPixelRect& r,
diff --git a/lib/kformula/errorelement.h b/lib/kformula/errorelement.h
index c7d69fedc..cfc2735de 100644
--- a/lib/kformula/errorelement.h
+++ b/lib/kformula/errorelement.h
@@ -27,11 +27,11 @@ KFORMULA_NAMESPACE_BEGIN
 class ErrorElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
-    ErrorElement( BasicElement* tqparent = 0 );
+    ErrorElement( BasicElement* parent = 0 );
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
diff --git a/lib/kformula/formulacursor.cc b/lib/kformula/formulacursor.cc
index b406a0025..9fe3afbde 100644
--- a/lib/kformula/formulacursor.cc
+++ b/lib/kformula/formulacursor.cc
@@ -325,10 +325,10 @@ void FormulaCursor::remove(TQPtrList<BasicElement>& tqchildren,
         // If there is no child to remove in the sequence
         // remove the sequence instead.
         if (sequence->countChildren() == 0) {
-            BasicElement* tqparent = sequence->getParent();
-            if (tqparent != 0) {
-                tqparent->selectChild(this, sequence);
-                tqparent->remove(this, tqchildren, direction);
+            BasicElement* parent = sequence->getParent();
+            if (parent != 0) {
+                parent->selectChild(this, sequence);
+                parent->remove(this, tqchildren, direction);
                 return;
             }
         }
@@ -363,12 +363,12 @@ void FormulaCursor::replaceSelectionWith(BasicElement* element,
         mainChild->goInside(this);
         insert(list);
         /*
-        BasicElement* tqparent = element->getParent();
+        BasicElement* parent = element->getParent();
         if (direction == beforeCursor) {
-            tqparent->moveRight(this, element);
+            parent->moveRight(this, element);
         }
         else {
-            tqparent->moveLeft(this, element);
+            parent->moveLeft(this, element);
         }
         */
         element->selectChild(this, mainChild);
@@ -412,10 +412,10 @@ BasicElement* FormulaCursor::replaceByMainChildContent(Direction direction)
 BasicElement* FormulaCursor::removeEnclosingElement(Direction direction)
 {
     assert( !isReadOnly() );
-    BasicElement* tqparent = getElement()->getParent();
-    if (tqparent != 0) {
-        if (getElement() == tqparent->getMainChild()) {
-            tqparent->selectChild(this, getElement());
+    BasicElement* parent = getElement()->getParent();
+    if (parent != 0) {
+        if (getElement() == parent->getMainChild()) {
+            parent->selectChild(this, getElement());
             return replaceByMainChildContent(direction);
         }
     }
diff --git a/lib/kformula/formulaelement.cc b/lib/kformula/formulaelement.cc
index 19081093b..946e595d3 100644
--- a/lib/kformula/formulaelement.cc
+++ b/lib/kformula/formulaelement.cc
@@ -313,18 +313,18 @@ TQString FormulaElement::toLatex()
     return inherited::toLatex();   //Consider $$ sorround
 }
 
-void FormulaElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const
+void FormulaElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const
 {
     TQDomElement de;
     if ( !oasisFormat ) {
         de = doc.createElementNS( "http://www.w3.org/1998/Math/MathML",
                                               "math" );
-        tqparent.appendChild( de );
+        parent.appendChild( de );
     }
     else {
         TQDomElement element = doc.createElement( "math:semantics" );
         de = doc.createElement( "math:mrow" );
-        tqparent.appendChild( element );
+        parent.appendChild( element );
         element.appendChild( de );
     }
     for ( uint i = 0; i < countChildren(); ++i ) {
diff --git a/lib/kformula/formulaelement.h b/lib/kformula/formulaelement.h
index 8f230128c..e67026680 100644
--- a/lib/kformula/formulaelement.h
+++ b/lib/kformula/formulaelement.h
@@ -35,7 +35,7 @@ class SymbolTable;
 /**
  * The main element.
  * A formula consists of a FormulaElement and its tqchildren.
- * The only element that has no tqparent.
+ * The only element that has no parent.
  */
 class FormulaElement : public SequenceElement {
     typedef SequenceElement inherited;
@@ -122,7 +122,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -170,7 +170,7 @@ public:
 
     virtual KCommand* input( Container* container, TQKeyEvent* event );
 
-    virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ;
+    virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ;
 
     /**
      * Appends our attributes to the dom element.
diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cc
index fb76a11e2..1230bb607 100644
--- a/lib/kformula/fractionelement.cc
+++ b/lib/kformula/fractionelement.cc
@@ -32,7 +32,7 @@
 KFORMULA_NAMESPACE_BEGIN
 using namespace std;
 
-FractionElement::FractionElement(BasicElement* tqparent) : BasicElement(tqparent),
+FractionElement::FractionElement(BasicElement* parent) : BasicElement(parent),
                                                          m_lineThicknessType( NoSize ),
                                                          m_numAlign( NoHorizontalAlign ),
                                                          m_denomAlign( NoHorizontalAlign ),
@@ -156,7 +156,7 @@ void FractionElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void FractionElement::draw( TQPainter& painter, const LuPixelRect& r,
diff --git a/lib/kformula/fractionelement.h b/lib/kformula/fractionelement.h
index 18c870fe2..cef69c134 100644
--- a/lib/kformula/fractionelement.h
+++ b/lib/kformula/fractionelement.h
@@ -36,7 +36,7 @@ public:
 
     enum { numeratorPos, denominatorPos };
 
-    FractionElement(BasicElement* tqparent = 0);
+    FractionElement(BasicElement* parent = 0);
     ~FractionElement();
 
     FractionElement( const FractionElement& );
@@ -79,7 +79,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
diff --git a/lib/kformula/glyphelement.cc b/lib/kformula/glyphelement.cc
index 79421f401..9d0b26e61 100644
--- a/lib/kformula/glyphelement.cc
+++ b/lib/kformula/glyphelement.cc
@@ -25,7 +25,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-GlyphElement::GlyphElement( BasicElement* tqparent ) : TextElement( ' ', false, tqparent ) {
+GlyphElement::GlyphElement( BasicElement* parent ) : TextElement( ' ', false, parent ) {
 }
 
 bool GlyphElement::readAttributesFromMathMLDom( const TQDomElement& element )
@@ -106,7 +106,7 @@ void GlyphElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
diff --git a/lib/kformula/glyphelement.h b/lib/kformula/glyphelement.h
index 1d3b6d8d9..e3934fce5 100644
--- a/lib/kformula/glyphelement.h
+++ b/lib/kformula/glyphelement.h
@@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN
 class GlyphElement : public TextElement {
     typedef TextElement inherited;
 public:
-    GlyphElement( BasicElement* tqparent = 0 );
+    GlyphElement( BasicElement* parent = 0 );
 
     /**
      * Calculates our width and height and
@@ -40,7 +40,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
diff --git a/lib/kformula/identifierelement.cc b/lib/kformula/identifierelement.cc
index 324151d5d..41cd2600e 100644
--- a/lib/kformula/identifierelement.cc
+++ b/lib/kformula/identifierelement.cc
@@ -32,13 +32,13 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-IdentifierElement::IdentifierElement( BasicElement* tqparent ) : TokenElement( tqparent ) {}
+IdentifierElement::IdentifierElement( BasicElement* parent ) : TokenElement( parent ) {}
 
 /*
  * Token elements' content has to be of homogeneous type. Every token element
  * must (TODO: check this) appear inside a non-token sequence, and thus, if
  * the command asks for a different content, a new element has to be created in
- * tqparent sequence.
+ * parent sequence.
  */
 KCommand* IdentifierElement::buildCommand( Container* container, Request* request )
 {
@@ -67,21 +67,21 @@ KCommand* IdentifierElement::buildCommand( Container* container, Request* reques
     }
 
     if ( countChildren() == 0 || cursor->getPos() == countChildren() ) {
-        // We are in the last position, so it's easy, call the tqparent to 
+        // We are in the last position, so it's easy, call the parent to 
         // create a new child
-        SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() );
-        if ( tqparent ) {
-            uint pos = tqparent->childPos( this );
-            cursor->setTo( tqparent, pos + 1);
-            return tqparent->buildCommand( container, request );
+        SequenceElement* parent = static_cast<SequenceElement*>( getParent() );
+        if ( parent ) {
+            uint pos = parent->childPos( this );
+            cursor->setTo( parent, pos + 1);
+            return parent->buildCommand( container, request );
         }
     }
     if ( cursor->getPos() == 0 ) {
-        SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() );
-        if ( tqparent ) {
-            uint pos = tqparent->childPos( this );
-            cursor->setTo( tqparent, pos );
-            return tqparent->buildCommand( container, request );
+        SequenceElement* parent = static_cast<SequenceElement*>( getParent() );
+        if ( parent ) {
+            uint pos = parent->childPos( this );
+            cursor->setTo( parent, pos );
+            return parent->buildCommand( container, request );
         }
     }
 
@@ -89,7 +89,7 @@ KCommand* IdentifierElement::buildCommand( Container* container, Request* reques
     // a) Cut from mark to the end
     // b) Create a new token and add an element from key pressed
     // c) Create a new token and add elements cut previously
-    // d) Move cursor to tqparent so that it command execution works fine
+    // d) Move cursor to parent so that it command execution works fine
 
     switch( *request ) {
     case req_addOperator: {
@@ -100,9 +100,9 @@ KCommand* IdentifierElement::buildCommand( Container* container, Request* reques
         command->addCursor( cursor );
         command->addToken( op );
         command->addContent( op, text );
-        SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() );
-        if ( tqparent ) {
-            cursor->setTo( tqparent, tqparent->childPos( this ) + 1 );
+        SequenceElement* parent = static_cast< SequenceElement* >( getParent() );
+        if ( parent ) {
+            cursor->setTo( parent, parent->childPos( this ) + 1 );
         }
         return command;
     }
@@ -114,9 +114,9 @@ KCommand* IdentifierElement::buildCommand( Container* container, Request* reques
         command->addCursor( cursor );
         command->addToken( num );
         command->addContent( num, text );
-        SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() );
-        if ( tqparent ) {
-            cursor->setTo( tqparent, tqparent->childPos( this ) + 1 );
+        SequenceElement* parent = static_cast< SequenceElement* >( getParent() );
+        if ( parent ) {
+            cursor->setTo( parent, parent->childPos( this ) + 1 );
         }
         return command;
     }
diff --git a/lib/kformula/identifierelement.h b/lib/kformula/identifierelement.h
index 485fc28e1..4e137315d 100644
--- a/lib/kformula/identifierelement.h
+++ b/lib/kformula/identifierelement.h
@@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN
 class IdentifierElement : public TokenElement {
     typedef TokenElement inherited;
 public:
-    IdentifierElement( BasicElement* tqparent = 0 );
+    IdentifierElement( BasicElement* parent = 0 );
 
     /**
      * This is called by the container to get a command depending on
diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cc
index a8d3b68a3..25b8997ab 100644
--- a/lib/kformula/indexelement.cc
+++ b/lib/kformula/indexelement.cc
@@ -38,7 +38,7 @@ class IndexSequenceElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
 
-    IndexSequenceElement( BasicElement* tqparent = 0 ) : SequenceElement( tqparent ) {}
+    IndexSequenceElement( BasicElement* parent = 0 ) : SequenceElement( parent ) {}
     virtual IndexSequenceElement* clone() {
         return new IndexSequenceElement( *this );
     }
@@ -90,8 +90,8 @@ KCommand* IndexSequenceElement::buildCommand( Container* container, Request* req
 }
 
 
-IndexElement::IndexElement(BasicElement* tqparent)
-    : BasicElement(tqparent),
+IndexElement::IndexElement(BasicElement* parent)
+    : BasicElement(parent),
       m_subScriptShiftType( NoSize ),
       m_superScriptShiftType( NoSize ),
       m_customAccentUnder( false ),
@@ -543,7 +543,7 @@ void IndexElement::calcSizes(const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void IndexElement::draw( TQPainter& painter, const LuPixelRect& r,
@@ -983,9 +983,9 @@ void IndexElement::remove(FormulaCursor* cursor,
         setToLowerLeft(cursor);
         break;
     case contentPos: {
-        BasicElement* tqparent = getParent();
-        tqparent->selectChild(cursor, this);
-        tqparent->remove(cursor, removedChildren, direction);
+        BasicElement* parent = getParent();
+        parent->selectChild(cursor, this);
+        parent->remove(cursor, removedChildren, direction);
         break;
     }
     case upperMiddlePos:
diff --git a/lib/kformula/indexelement.h b/lib/kformula/indexelement.h
index b86f0dc4e..f3fc1acba 100644
--- a/lib/kformula/indexelement.h
+++ b/lib/kformula/indexelement.h
@@ -35,7 +35,7 @@ class IndexElement : public BasicElement {
     IndexElement& operator=( const IndexElement& ) { return *this; }
 public:
 
-    IndexElement(BasicElement* tqparent = 0);
+    IndexElement(BasicElement* parent = 0);
     ~IndexElement();
 
     IndexElement( const IndexElement& );
@@ -86,7 +86,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -314,78 +314,78 @@ private:
      */
     class IndexElementIndex : public ElementIndex {
     public:
-        IndexElementIndex(IndexElement* p) : tqparent(p) {}
-        virtual IndexElement* getElement() { return tqparent; }
+        IndexElementIndex(IndexElement* p) : parent(p) {}
+        virtual IndexElement* getElement() { return parent; }
     protected:
-        IndexElement* tqparent;
+        IndexElement* parent;
     };
 
     // We have a (very simple) type for every index.
 
     class UpperLeftIndex : public IndexElementIndex {
     public:
-        UpperLeftIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {}
+        UpperLeftIndex(IndexElement* parent) : IndexElementIndex(parent) {}
         virtual void moveToIndex(FormulaCursor* cursor, Direction direction)
-            { tqparent->moveToUpperLeft(cursor, direction); }
+            { parent->moveToUpperLeft(cursor, direction); }
         virtual void setToIndex(FormulaCursor* cursor)
-            { tqparent->setToUpperLeft(cursor); }
+            { parent->setToUpperLeft(cursor); }
         virtual bool hasIndex() const
-            { return tqparent->hasUpperLeft(); }
+            { return parent->hasUpperLeft(); }
     };
 
     class LowerLeftIndex : public IndexElementIndex {
     public:
-        LowerLeftIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {}
+        LowerLeftIndex(IndexElement* parent) : IndexElementIndex(parent) {}
         virtual void moveToIndex(FormulaCursor* cursor, Direction direction)
-            { tqparent->moveToLowerLeft(cursor, direction); }
+            { parent->moveToLowerLeft(cursor, direction); }
         virtual void setToIndex(FormulaCursor* cursor)
-            { tqparent->setToLowerLeft(cursor); }
+            { parent->setToLowerLeft(cursor); }
         virtual bool hasIndex() const
-            { return tqparent->hasLowerLeft(); }
+            { return parent->hasLowerLeft(); }
     };
 
     class UpperMiddleIndex : public IndexElementIndex {
     public:
-        UpperMiddleIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {}
+        UpperMiddleIndex(IndexElement* parent) : IndexElementIndex(parent) {}
         virtual void moveToIndex(FormulaCursor* cursor, Direction direction)
-            { tqparent->moveToUpperMiddle(cursor, direction); }
+            { parent->moveToUpperMiddle(cursor, direction); }
         virtual void setToIndex(FormulaCursor* cursor)
-            { tqparent->setToUpperMiddle(cursor); }
+            { parent->setToUpperMiddle(cursor); }
         virtual bool hasIndex() const
-            { return tqparent->hasUpperMiddle(); }
+            { return parent->hasUpperMiddle(); }
     };
 
     class LowerMiddleIndex : public IndexElementIndex {
     public:
-        LowerMiddleIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {}
+        LowerMiddleIndex(IndexElement* parent) : IndexElementIndex(parent) {}
         virtual void moveToIndex(FormulaCursor* cursor, Direction direction)
-            { tqparent->moveToLowerMiddle(cursor, direction); }
+            { parent->moveToLowerMiddle(cursor, direction); }
         virtual void setToIndex(FormulaCursor* cursor)
-            { tqparent->setToLowerMiddle(cursor); }
+            { parent->setToLowerMiddle(cursor); }
         virtual bool hasIndex() const
-            { return tqparent->hasLowerMiddle(); }
+            { return parent->hasLowerMiddle(); }
     };
 
     class UpperRightIndex : public IndexElementIndex {
     public:
-        UpperRightIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {}
+        UpperRightIndex(IndexElement* parent) : IndexElementIndex(parent) {}
         virtual void moveToIndex(FormulaCursor* cursor, Direction direction)
-            { tqparent->moveToUpperRight(cursor, direction); }
+            { parent->moveToUpperRight(cursor, direction); }
         virtual void setToIndex(FormulaCursor* cursor)
-            { tqparent->setToUpperRight(cursor); }
+            { parent->setToUpperRight(cursor); }
         virtual bool hasIndex() const
-            { return tqparent->hasUpperRight(); }
+            { return parent->hasUpperRight(); }
     };
 
     class LowerRightIndex : public IndexElementIndex {
     public:
-        LowerRightIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {}
+        LowerRightIndex(IndexElement* parent) : IndexElementIndex(parent) {}
         virtual void moveToIndex(FormulaCursor* cursor, Direction direction)
-            { tqparent->moveToLowerRight(cursor, direction); }
+            { parent->moveToLowerRight(cursor, direction); }
         virtual void setToIndex(FormulaCursor* cursor)
-            { tqparent->setToLowerRight(cursor); }
+            { parent->setToLowerRight(cursor); }
         virtual bool hasIndex() const
-            { return tqparent->hasLowerRight(); }
+            { return parent->hasLowerRight(); }
     };
 
 
diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc
index 178ec399f..267038c45 100644
--- a/lib/kformula/kformulacommand.cc
+++ b/lib/kformula/kformulacommand.cc
@@ -220,7 +220,7 @@ void KFCAddToken::unexecute()
 {
     kdDebug( DEBUGID ) << k_funcinfo << endl;
     FormulaCursor* cursor = getUnexecuteCursor();
-    SequenceElement* tqparent = static_cast<SequenceElement*>(cursor->getElement()->getParent());
+    SequenceElement* parent = static_cast<SequenceElement*>(cursor->getElement()->getParent());
 
     for ( int i = 0; i < tokenList.count(); i++ ) {
         SequenceElement* current = static_cast<SequenceElement*>(cursor->getElement());
@@ -228,12 +228,12 @@ void KFCAddToken::unexecute()
         for ( uint i = 0; i < current->countChildren(); ++i ) {
             cursor->remove( list, beforeCursor );
         }
-        if ( tqparent ) {
-            int pos = tqparent->childPos( current );
-            cursor->setTo( tqparent, pos + 1);
+        if ( parent ) {
+            int pos = parent->childPos( current );
+            cursor->setTo( parent, pos + 1);
             cursor->remove( list, beforeCursor );
             if ( pos > 0 ) {
-                BasicElement* element = tqparent->getChild( pos - 1 );
+                BasicElement* element = parent->getChild( pos - 1 );
                 if (element)
                     element->moveEnd( cursor );
             }
@@ -306,9 +306,9 @@ void KFCSplitToken::execute()
         removeSelection->execute();
     }
     splitCursor = cursor->getCursorData();
-    SequenceElement* tqparent = static_cast<SequenceElement*>( cursor->getElement() );
-    if ( tqparent ) {
-        cursor->setMark( tqparent->countChildren() );
+    SequenceElement* parent = static_cast<SequenceElement*>( cursor->getElement() );
+    if ( parent ) {
+        cursor->setMark( parent->countChildren() );
         cursor->setSelection( true );
     }
     cursor->remove( splitList, afterCursor );
@@ -322,8 +322,8 @@ void KFCSplitToken::execute()
     }
     KFCAddToken::execute();
     cursor = getExecuteCursor();
-    if ( tqparent ) {
-        BasicElement* child = tqparent->getChild( cursor->getPos() );
+    if ( parent ) {
+        BasicElement* child = parent->getChild( cursor->getPos() );
         if ( child ) {
             child->moveEnd( cursor );
         }
diff --git a/lib/kformula/kformulacommand.h b/lib/kformula/kformulacommand.h
index a63053d79..090010409 100644
--- a/lib/kformula/kformulacommand.h
+++ b/lib/kformula/kformulacommand.h
@@ -385,7 +385,7 @@ private:
 
 
 /**
- * Command to remove the tqparent element.
+ * Command to remove the parent element.
  */
 class KFCRemoveEnclosing : public Command
 {
@@ -495,7 +495,7 @@ public:
     void addTextElement( TextElement* element ) { list.append(element); }
 
     /**
-     * Collects all tqparent elements those tqchildren are to be changend.
+     * Collects all parent elements those tqchildren are to be changend.
      */
     void addElement( BasicElement* element ) { elementList.append( element ); }
 
diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc
index add9c8406..21c3b9469 100644
--- a/lib/kformula/kformulaconfigpage.cc
+++ b/lib/kformula/kformulaconfigpage.cc
@@ -54,7 +54,7 @@ KFORMULA_NAMESPACE_BEGIN
 
 
 ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* config, TQVBox* box, char* name )
-    : TQObject( box->tqparent(), name ), m_document( document ), m_view( view ), m_config( config ), m_changed( false )
+    : TQObject( box->parent(), name ), m_document( document ), m_view( view ), m_config( config ), m_changed( false )
 {
     const ContextStyle& contextStyle = document->getContextStyle( true );
 
@@ -167,18 +167,18 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi
 }
 
 
-TQPushButton* ConfigurePage::buildFontLine( TQWidget* tqparent,
+TQPushButton* ConfigurePage::buildFontLine( TQWidget* parent,
             TQGridLayout* tqlayout, int number, TQFont font, TQString name,
             TQLabel*& fontName )
 {
-    TQLabel* fontTitle = new TQLabel( name, tqparent );
+    TQLabel* fontTitle = new TQLabel( name, parent );
 
     TQString labelName = font.family() + ' ' + TQString::number( font.pointSize() );
-    fontName = new TQLabel( labelName, tqparent );
+    fontName = new TQLabel( labelName, parent );
     fontName->setFont( font );
     fontName->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
 
-    TQPushButton* chooseButton = new TQPushButton( i18n( "Choose..." ), tqparent );
+    TQPushButton* chooseButton = new TQPushButton( i18n( "Choose..." ), parent );
 
     tqlayout->addWidget( fontTitle, number, 0 );
     tqlayout->addWidget( fontName, number, 1 );
@@ -319,8 +319,8 @@ void ConfigurePage::slotChanged()
 
 // class UsedFontItem : public KListViewItem {
 // public:
-//     UsedFontItem( MathFontsConfigurePage* page, TQListView* tqparent, TQString font )
-//         : KListViewItem( tqparent, font ), m_page( page ) {}
+//     UsedFontItem( MathFontsConfigurePage* page, TQListView* parent, TQString font )
+//         : KListViewItem( parent, font ), m_page( page ) {}
 
 //     int compare( TQListViewItem* i, int col, bool ascending ) const;
 
@@ -343,7 +343,7 @@ void ConfigurePage::slotChanged()
 
 // MathFontsConfigurePage::MathFontsConfigurePage( Document* document, TQWidget* view,
 //                                                 KConfig* config, TQVBox* box, char* name )
-//     : TQObject( box->tqparent(), name ), m_document( document ), m_view( view ), m_config( config )
+//     : TQObject( box->parent(), name ), m_document( document ), m_view( view ), m_config( config )
 // {
 //     TQWidget* fontWidget = new TQWidget( box );
 //     TQGridLayout* fontLayout = new TQGridLayout( fontWidget, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc
index 228b4017e..17d163f08 100644
--- a/lib/kformula/kformuladocument.cc
+++ b/lib/kformula/kformuladocument.cc
@@ -61,9 +61,9 @@ int FormulaList::compareItems( TQPtrCollection::Item a, TQPtrCollection::Item b
 }
 
 
-Document::Document( TQObject *tqparent, const char *name,
+Document::Document( TQObject *parent, const char *name,
                     const TQStringList &/*args*/ )
-    : TQObject( tqparent, name ), m_wrapper( 0 ), m_formula( 0 ), creationStrategy( 0 )
+    : TQObject( parent, name ), m_wrapper( 0 ), m_formula( 0 ), creationStrategy( 0 )
 {
     m_contextStyle = new ContextStyle;
     setCreationStrategy( "Oasis" );
diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h
index 62b2dab3c..46de57743 100644
--- a/lib/kformula/kformuladocument.h
+++ b/lib/kformula/kformuladocument.h
@@ -77,7 +77,7 @@ public:
     /**
      * Creates a formula document.
      */
-    Document( TQObject *tqparent=0, const char *name=0,
+    Document( TQObject *parent=0, const char *name=0,
               const TQStringList &args=TQStringList() );
     ~Document();
 
diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc
index 0de1ad7c4..ef5e09a35 100644
--- a/lib/kformula/kformulawidget.cc
+++ b/lib/kformula/kformulawidget.cc
@@ -35,8 +35,8 @@
 #include "kformulawidget.h"
 
 
-KFormulaWidget::KFormulaWidget(Container* doc, TQWidget* tqparent, const char* name, WFlags f)
-    : TQWidget(tqparent, name, f | WRepaintNoErase | WResizeNoErase),
+KFormulaWidget::KFormulaWidget(Container* doc, TQWidget* parent, const char* name, WFlags f)
+    : TQWidget(parent, name, f | WRepaintNoErase | WResizeNoErase),
       formulaView(doc)
 {
     connect(doc, TQT_SIGNAL(formulaChanged(int, int)),
diff --git a/lib/kformula/kformulawidget.h b/lib/kformula/kformulawidget.h
index ead28ddcd..1b6d8d986 100644
--- a/lib/kformula/kformulawidget.h
+++ b/lib/kformula/kformulawidget.h
@@ -50,7 +50,7 @@ class KFormulaWidget : public TQWidget {
   TQ_OBJECT
 
 public:
-    KFormulaWidget(Container*, TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+    KFormulaWidget(Container*, TQWidget* parent=0, const char* name=0, WFlags f=0);
     ~KFormulaWidget();
 
 
diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc
index dde697311..573447398 100644
--- a/lib/kformula/main.cc
+++ b/lib/kformula/main.cc
@@ -33,8 +33,8 @@ using namespace KFormula;
 
 class TestWidget : public KFormulaWidget {
 public:
-    TestWidget(Container* doc, TQWidget* tqparent=0, const char* name=0, WFlags f=0)
-            : KFormulaWidget(doc, tqparent, name, f) {}
+    TestWidget(Container* doc, TQWidget* parent=0, const char* name=0, WFlags f=0)
+            : KFormulaWidget(doc, parent, name, f) {}
 
 protected:
     virtual void keyPressEvent(TQKeyEvent* event);
diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc
index 56062dcd6..6b5a5898a 100644
--- a/lib/kformula/matrixelement.cc
+++ b/lib/kformula/matrixelement.cc
@@ -43,7 +43,7 @@ class MatrixSequenceElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
 
-    MatrixSequenceElement( BasicElement* tqparent = 0 ) : SequenceElement( tqparent ) {}
+    MatrixSequenceElement( BasicElement* parent = 0 ) : SequenceElement( parent ) {}
     virtual MatrixSequenceElement* clone() {
         return new MatrixSequenceElement( *this );
     }
@@ -269,8 +269,8 @@ KFCInsertColumn::KFCInsertColumn( const TQString& name, Container* document, Mat
 }
 
 
-MatrixElement::MatrixElement(uint rows, uint columns, BasicElement* tqparent)
-    : BasicElement(tqparent),
+MatrixElement::MatrixElement(uint rows, uint columns, BasicElement* parent)
+    : BasicElement(parent),
       m_rowNumber( 0 ),
       m_align( NoAlign ),
       m_widthType( NoSize ),
@@ -509,7 +509,7 @@ void MatrixElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void MatrixElement::draw( TQPainter& painter, const LuPixelRect& rect,
@@ -1799,7 +1799,7 @@ class MultilineSequenceElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
 
-    MultilineSequenceElement( BasicElement* tqparent = 0 );
+    MultilineSequenceElement( BasicElement* parent = 0 );
 
     virtual MultilineSequenceElement* clone() {
         return new MultilineSequenceElement( *this );
@@ -1846,7 +1846,7 @@ public:
     /// Return the position of tab i.
     int tabPos( uint i );
 
-    virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ;
+    virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ;
 
 private:
 
@@ -1890,9 +1890,9 @@ KFCNewLine::~KFCNewLine()
 void KFCNewLine::execute()
 {
     FormulaCursor* cursor = getExecuteCursor();
-    MultilineElement* tqparent = static_cast<MultilineElement*>( m_line->getParent() );
-    int linePos = tqparent->content.find( m_line );
-    tqparent->content.insert( linePos+1, m_newline );
+    MultilineElement* parent = static_cast<MultilineElement*>( m_line->getParent() );
+    int linePos = parent->content.find( m_line );
+    parent->content.insert( linePos+1, m_newline );
 
     // If there are tqchildren to be moved.
     if ( m_line->countChildren() > static_cast<int>( m_pos ) ) {
@@ -1925,11 +1925,11 @@ void KFCNewLine::execute()
 void KFCNewLine::unexecute()
 {
     FormulaCursor* cursor = getExecuteCursor();
-    MultilineElement* tqparent = static_cast<MultilineElement*>( m_line->getParent() );
-    int linePos = tqparent->content.find( m_line );
+    MultilineElement* parent = static_cast<MultilineElement*>( m_line->getParent() );
+    int linePos = parent->content.find( m_line );
 
     // Now the command owns the new line again.
-    m_newline = tqparent->content.at( linePos+1 );
+    m_newline = parent->content.at( linePos+1 );
 
     // Tell all cursors to leave this sequence
     FormulaElement* formula = m_line->formula();
@@ -1951,7 +1951,7 @@ void KFCNewLine::unexecute()
     else {
         m_line->moveEnd( cursor );
     }
-    tqparent->content.take( linePos+1 );
+    parent->content.take( linePos+1 );
 
     // Tell that something changed
     formula->changed();
@@ -1959,8 +1959,8 @@ void KFCNewLine::unexecute()
 }
 
 
-MultilineSequenceElement::MultilineSequenceElement( BasicElement* tqparent )
-    : SequenceElement( tqparent )
+MultilineSequenceElement::MultilineSequenceElement( BasicElement* parent )
+    : SequenceElement( parent )
 {
     tabs.setAutoDelete( false );
 }
@@ -2111,9 +2111,9 @@ int MultilineSequenceElement::tabPos( uint i )
 
 
 void MultilineSequenceElement::writeMathML( TQDomDocument& doc,
-                                            TQDomNode& tqparent, bool oasisFormat ) const
+                                            TQDomNode& parent, bool oasisFormat ) const
 {
-    // tqparent is required to be a <mtr> tag
+    // parent is required to be a <mtr> tag
 
     TQDomElement tmp = doc.createElement( "TMP" );
 
@@ -2131,7 +2131,7 @@ void MultilineSequenceElement::writeMathML( TQDomDocument& doc,
     while ( !n.isNull() ) {
         // the illegal TabMarkers are tqchildren of the mrow, child of tmp.
         if ( n.isElement() && n.toElement().tagName() == "TAB" ) {
-            tqparent.appendChild( mtd );
+            parent.appendChild( mtd );
             mtd = doc.createElement( oasisFormat ? "math:mtd" : "mtd" );
         }
         else {
@@ -2140,12 +2140,12 @@ void MultilineSequenceElement::writeMathML( TQDomDocument& doc,
         n = n.nextSibling();
     }
 
-    tqparent.appendChild( mtd );
+    parent.appendChild( mtd );
 }
 
 
-MultilineElement::MultilineElement( BasicElement* tqparent )
-    : BasicElement( tqparent )
+MultilineElement::MultilineElement( BasicElement* parent )
+    : BasicElement( parent )
 {
     content.setAutoDelete( true );
     content.append( new MultilineSequenceElement( this ) );
@@ -2217,14 +2217,14 @@ void MultilineElement::moveLeft( FormulaCursor* cursor, BasicElement* from )
         getParent()->moveLeft(cursor, this);
     }
     else {
-        // Coming from the tqparent (sequence) we go to
+        // Coming from the parent (sequence) we go to
         // the very last position
         if (from == getParent()) {
             content.at( content.count()-1 )->moveLeft(cursor, this);
         }
         else {
             // Coming from one of the lines we go to the previous line
-            // or to the tqparent if there is none.
+            // or to the parent if there is none.
             int pos = content.find( static_cast<MultilineSequenceElement*>( from ) );
             if ( pos > -1 ) {
                 if ( pos > 0 ) {
@@ -2279,14 +2279,14 @@ void MultilineElement::moveUp( FormulaCursor* cursor, BasicElement* from )
         getParent()->moveLeft(cursor, this);
     }
     else {
-        // Coming from the tqparent (sequence) we go to
+        // Coming from the parent (sequence) we go to
         // the very last position
         if (from == getParent()) {
             content.at( content.count()-1 )->moveLeft(cursor, this);
         }
         else {
             // Coming from one of the lines we go to the previous line
-            // or to the tqparent if there is none.
+            // or to the parent if there is none.
             int pos = content.find( static_cast<MultilineSequenceElement*>( from ) );
             if ( pos > -1 ) {
                 if ( pos > 0 ) {
@@ -2591,7 +2591,7 @@ void MultilineElement::writeDom(TQDomElement element)
     }
 }
 
-void MultilineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const
+void MultilineElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const
 {
     TQDomElement de = doc.createElement( oasisFormat ? "math:mtable" : "mtable" );
     TQDomElement row; TQDomElement cell;
@@ -2606,7 +2606,7 @@ void MultilineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, boo
         it.current()->writeMathML( doc, row, oasisFormat );
     }
 
-    tqparent.appendChild( de );
+    parent.appendChild( de );
 }
 
 /**
diff --git a/lib/kformula/matrixelement.h b/lib/kformula/matrixelement.h
index 042032579..894266593 100644
--- a/lib/kformula/matrixelement.h
+++ b/lib/kformula/matrixelement.h
@@ -45,7 +45,7 @@ class MatrixElement : public BasicElement {
     enum SideType { NoSide, LeftSide, RightSide, LeftOverlapSide, RightOverlapSide };
     MatrixElement& operator=( const MatrixElement& ) { return *this; }
 public:
-    MatrixElement(uint rows = 1, uint columns = 1, BasicElement* tqparent = 0);
+    MatrixElement(uint rows = 1, uint columns = 1, BasicElement* parent = 0);
     ~MatrixElement();
 
     MatrixElement( const MatrixElement& );
@@ -89,7 +89,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -316,7 +316,7 @@ public:
      * The container this FormulaElement belongs to must not be 0,
      * except you really know what you are doing.
      */
-    MultilineElement( BasicElement* tqparent = 0 );
+    MultilineElement( BasicElement* parent = 0 );
     ~MultilineElement();
 
     MultilineElement( const MultilineElement& );
@@ -384,7 +384,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -420,7 +420,7 @@ public:
 
     virtual TQString formulaString();
 
-    virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ;
+    virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ;
 
 protected:
 
diff --git a/lib/kformula/numberelement.cc b/lib/kformula/numberelement.cc
index 4532d2591..41ddc1798 100644
--- a/lib/kformula/numberelement.cc
+++ b/lib/kformula/numberelement.cc
@@ -31,13 +31,13 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-NumberElement::NumberElement( BasicElement* tqparent ) : TokenElement( tqparent ) {}
+NumberElement::NumberElement( BasicElement* parent ) : TokenElement( parent ) {}
 
 /*
  * Token elements' content has to be of homogeneous type. Every token element
  * must (TODO: check this) appear inside a non-token sequence, and thus, if
  * the command asks for a different content, a new element has to be created in
- * tqparent sequence.
+ * parent sequence.
  */
 KCommand* NumberElement::buildCommand( Container* container, Request* request )
 {
@@ -56,21 +56,21 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request )
     }
 
     if ( countChildren() == 0 || cursor->getPos() == countChildren() ) {
-        // We are in the last position, so it's easy, call the tqparent to 
+        // We are in the last position, so it's easy, call the parent to 
         // create a new child
-        SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() );
-        if ( tqparent ) {
-            uint pos = tqparent->childPos( this );
-            cursor->setTo( tqparent, pos + 1);
-            return tqparent->buildCommand( container, request );
+        SequenceElement* parent = static_cast<SequenceElement*>( getParent() );
+        if ( parent ) {
+            uint pos = parent->childPos( this );
+            cursor->setTo( parent, pos + 1);
+            return parent->buildCommand( container, request );
         }
     }
     if ( cursor->getPos() == 0 ) {
-        SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() );
-        if ( tqparent ) {
-            uint pos = tqparent->childPos( this );
-            cursor->setTo( tqparent, pos );
-            return tqparent->buildCommand( container, request );
+        SequenceElement* parent = static_cast<SequenceElement*>( getParent() );
+        if ( parent ) {
+            uint pos = parent->childPos( this );
+            cursor->setTo( parent, pos );
+            return parent->buildCommand( container, request );
         }
     }
 
@@ -78,7 +78,7 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request )
     // a) Cut from mark to the end
     // b) Create a new token and add an element from key pressed
     // c) Create a new token and add elements cut previously
-    // d) Move cursor to tqparent so that it command execution works fine
+    // d) Move cursor to parent so that it command execution works fine
 
     switch( *request ) {
     case req_addTextChar: {
@@ -89,9 +89,9 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request )
         command->addCursor( cursor );
         command->addToken( id );
         command->addContent( id, text );
-        SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() );
-        if ( tqparent ) {
-            cursor->setTo( tqparent, tqparent->childPos( this ) + 1 );
+        SequenceElement* parent = static_cast< SequenceElement* >( getParent() );
+        if ( parent ) {
+            cursor->setTo( parent, parent->childPos( this ) + 1 );
         }
         return command;
     }
@@ -106,9 +106,9 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request )
             TextElement* text = creationStrategy->createTextElement( tr->text()[i] );
             command->addContent( id, text );
         }
-        SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() );
-        if ( tqparent ) {
-            cursor->setTo( tqparent, tqparent->childPos( this ) + 1 );
+        SequenceElement* parent = static_cast< SequenceElement* >( getParent() );
+        if ( parent ) {
+            cursor->setTo( parent, parent->childPos( this ) + 1 );
         }
         return command;
     }
@@ -121,9 +121,9 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request )
         command->addCursor( cursor );
         command->addToken( op );
         command->addContent( op, text );
-        SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() );
-        if ( tqparent ) {
-            cursor->setTo( tqparent, tqparent->childPos( this ) + 1 );
+        SequenceElement* parent = static_cast< SequenceElement* >( getParent() );
+        if ( parent ) {
+            cursor->setTo( parent, parent->childPos( this ) + 1 );
         }
         return command;
     }
@@ -136,11 +136,11 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request )
     case req_addSymbol:
     case req_addOneByTwoMatrix:
     case req_addMatrix: {
-        SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() );
-        if ( tqparent ) {
-            uint pos = tqparent->childPos( this );
-            cursor->setTo( tqparent, pos + 1);
-            return tqparent->buildCommand( container, request );
+        SequenceElement* parent = static_cast<SequenceElement*>( getParent() );
+        if ( parent ) {
+            uint pos = parent->childPos( this );
+            cursor->setTo( parent, pos + 1);
+            return parent->buildCommand( container, request );
         }
     }
     default:
diff --git a/lib/kformula/numberelement.h b/lib/kformula/numberelement.h
index fe6d92e47..3a8295ad7 100644
--- a/lib/kformula/numberelement.h
+++ b/lib/kformula/numberelement.h
@@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN
 class NumberElement : public TokenElement {
     typedef TokenElement inherited;
 public:
-    NumberElement( BasicElement* tqparent = 0 );
+    NumberElement( BasicElement* parent = 0 );
 
     /**
      * This is called by the container to get a command depending on
diff --git a/lib/kformula/operatorelement.cc b/lib/kformula/operatorelement.cc
index a9deab3ca..66c1fcdc6 100644
--- a/lib/kformula/operatorelement.cc
+++ b/lib/kformula/operatorelement.cc
@@ -39,7 +39,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-OperatorElement::OperatorElement( BasicElement* tqparent ) : TokenElement( tqparent ),
+OperatorElement::OperatorElement( BasicElement* parent ) : TokenElement( parent ),
                                                            m_form( NoForm ),
                                                            m_lspaceType( ThickMathSpace ),
                                                            m_rspaceType( ThickMathSpace ),
@@ -159,7 +159,7 @@ void OperatorElement::setForm( FormType type )
  * Token elements' content has to be of homogeneous type. Every token element
  * must (TODO: check this) appear inside a non-token sequence, and thus, if
  * the command asks for a different content, a new element has to be created in
- * tqparent sequence.
+ * parent sequence.
  */
 KCommand* OperatorElement::buildCommand( Container* container, Request* request )
 {
@@ -178,21 +178,21 @@ KCommand* OperatorElement::buildCommand( Container* container, Request* request
     }
 
     if ( countChildren() == 0 || cursor->getPos() == countChildren() ) {
-        // We are in the last position, so it's easy, call the tqparent to 
+        // We are in the last position, so it's easy, call the parent to 
         // create a new child
-        SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() );
-        if ( tqparent ) {
-            uint pos = tqparent->childPos( this );
-            cursor->setTo( tqparent, pos + 1);
-            return tqparent->buildCommand( container, request );
+        SequenceElement* parent = static_cast<SequenceElement*>( getParent() );
+        if ( parent ) {
+            uint pos = parent->childPos( this );
+            cursor->setTo( parent, pos + 1);
+            return parent->buildCommand( container, request );
         }
     }
     if ( cursor->getPos() == 0 ) {
-        SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() );
-        if ( tqparent ) {
-            uint pos = tqparent->childPos( this );
-            cursor->setTo( tqparent, pos );
-            return tqparent->buildCommand( container, request );
+        SequenceElement* parent = static_cast<SequenceElement*>( getParent() );
+        if ( parent ) {
+            uint pos = parent->childPos( this );
+            cursor->setTo( parent, pos );
+            return parent->buildCommand( container, request );
         }
     }
 
@@ -200,7 +200,7 @@ KCommand* OperatorElement::buildCommand( Container* container, Request* request
     // a) Cut from mark to the end
     // b) Create a new token and add an element from key pressed
     // c) Create a new token and add elements cut previously
-    // d) Move cursor to tqparent so that it command execution works fine
+    // d) Move cursor to parent so that it command execution works fine
 
     switch( *request ) {
     case req_addTextChar: {
@@ -211,9 +211,9 @@ KCommand* OperatorElement::buildCommand( Container* container, Request* request
         command->addCursor( cursor );
         command->addToken( id );
         command->addContent( id, text );
-        SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() );
-        if ( tqparent ) {
-            cursor->setTo( tqparent, tqparent->childPos( this ) + 1 );
+        SequenceElement* parent = static_cast< SequenceElement* >( getParent() );
+        if ( parent ) {
+            cursor->setTo( parent, parent->childPos( this ) + 1 );
         }
         return command;
     }
@@ -228,9 +228,9 @@ KCommand* OperatorElement::buildCommand( Container* container, Request* request
             TextElement* text = creationStrategy->createTextElement( tr->text()[i] );
             command->addContent( id, text );
         }
-        SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() );
-        if ( tqparent ) {
-            cursor->setTo( tqparent, tqparent->childPos( this ) + 1 );
+        SequenceElement* parent = static_cast< SequenceElement* >( getParent() );
+        if ( parent ) {
+            cursor->setTo( parent, parent->childPos( this ) + 1 );
         }
         return command;
     }
@@ -243,9 +243,9 @@ KCommand* OperatorElement::buildCommand( Container* container, Request* request
         command->addCursor( cursor );
         command->addToken( num );
         command->addContent( num, text );
-        SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() );
-        if ( tqparent ) {
-            cursor->setTo( tqparent, tqparent->childPos( this ) + 1 );
+        SequenceElement* parent = static_cast< SequenceElement* >( getParent() );
+        if ( parent ) {
+            cursor->setTo( parent, parent->childPos( this ) + 1 );
         }
         return command;
     }
diff --git a/lib/kformula/operatorelement.h b/lib/kformula/operatorelement.h
index 52c35537a..f16f02c4b 100644
--- a/lib/kformula/operatorelement.h
+++ b/lib/kformula/operatorelement.h
@@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN
 class OperatorElement : public TokenElement {
     typedef TokenElement inherited;
 public:
-    OperatorElement( BasicElement* tqparent = 0 );
+    OperatorElement( BasicElement* parent = 0 );
     void setForm( FormType type );
 
     /**
diff --git a/lib/kformula/paddedelement.cc b/lib/kformula/paddedelement.cc
index 5270a4f7d..f153a339f 100644
--- a/lib/kformula/paddedelement.cc
+++ b/lib/kformula/paddedelement.cc
@@ -22,7 +22,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-PaddedElement::PaddedElement( BasicElement* tqparent ) : SequenceElement( tqparent ),
+PaddedElement::PaddedElement( BasicElement* parent ) : SequenceElement( parent ),
                                                        m_widthType( NoSize ),
                                                        m_lspaceType( NoSize ),
                                                        m_heightType( NoSize ),
diff --git a/lib/kformula/paddedelement.h b/lib/kformula/paddedelement.h
index 811f861e9..5df95b74e 100644
--- a/lib/kformula/paddedelement.h
+++ b/lib/kformula/paddedelement.h
@@ -28,7 +28,7 @@ class PaddedElement : public SequenceElement {
     typedef SequenceElement inherited;
     enum SizeType { NoSize, RelativeSize, AbsoluteSize, PixelSize, WidthRelativeSize, HeightRelativeSize };
 public:
-    PaddedElement( BasicElement* tqparent = 0 );
+    PaddedElement( BasicElement* parent = 0 );
 
     /**
      * Calculates our width and height and
diff --git a/lib/kformula/phantomelement.cc b/lib/kformula/phantomelement.cc
index 72b564a6d..e2a07fc6d 100644
--- a/lib/kformula/phantomelement.cc
+++ b/lib/kformula/phantomelement.cc
@@ -21,13 +21,13 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-PhantomElement::PhantomElement( BasicElement* tqparent ) : SequenceElement( tqparent ) 
+PhantomElement::PhantomElement( BasicElement* parent ) : SequenceElement( parent ) 
 {
 }
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void PhantomElement::draw( TQPainter&, const LuPixelRect&, const ContextStyle&,
diff --git a/lib/kformula/phantomelement.h b/lib/kformula/phantomelement.h
index cf89d8936..373c35450 100644
--- a/lib/kformula/phantomelement.h
+++ b/lib/kformula/phantomelement.h
@@ -27,11 +27,11 @@ KFORMULA_NAMESPACE_BEGIN
 class PhantomElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
-    PhantomElement( BasicElement* tqparent = 0 );
+    PhantomElement( BasicElement* parent = 0 );
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
diff --git a/lib/kformula/prototype/engine.py b/lib/kformula/prototype/engine.py
index 0ce870cfe..a2a944875 100644
--- a/lib/kformula/prototype/engine.py
+++ b/lib/kformula/prototype/engine.py
@@ -24,8 +24,8 @@ from qt import *
 class BasicElement:
     """The interface for every element."""
     
-    def __init__(self, tqparent):
-        self.tqparent = tqparent
+    def __init__(self, parent):
+        self.parent = parent
         self.size = QSize()
         self.pos = QPoint()
 
@@ -47,7 +47,7 @@ class BasicElement:
         while element != None:
             x += element.x()
             y += element.y()
-            element = element.tqparent
+            element = element.parent
         return QPoint(x, y)
 
     def elementAt(self, point, startPoint):
@@ -79,7 +79,7 @@ class BasicElement:
     
     def formula(self):
         """Returns the FormulaElement we are a child of."""
-        return self.tqparent.formula()
+        return self.parent.formula()
 
     def draw(self, painter, styleContext, startPoint):
         """Draws the whole thing. Including its tqchildren."""
@@ -87,11 +87,11 @@ class BasicElement:
 
     def calcSizes(self, styleContext):
         """Recalculates the size.
-        position (relative our to tqparent), width and height
+        position (relative our to parent), width and height
         will be stored in self.size,
         the midline offset in self.midline.
 
-        Please note: It's up to a tqparent to store its tqchildren's position."""
+        Please note: It's up to a parent to store its tqchildren's position."""
         pass
 
     def mainChild(self):
@@ -119,8 +119,8 @@ class SequenceElement (BasicElement):
     """The element that contains a number of tqchildren.
     The tqchildren are aligned in one line."""
     
-    def __init__(self, tqparent):
-        BasicElement.__init__(self, tqparent)
+    def __init__(self, parent):
+        BasicElement.__init__(self, parent)
         self.tqchildren = []
 
     def elementAtCursor(self, cursor):
@@ -141,8 +141,8 @@ class SequenceElement (BasicElement):
         
     def moveLeft(self, cursor, fromElement):
 
-        # Our tqparent asks us for a cursor position. Found.
-        if fromElement == self.tqparent:
+        # Our parent asks us for a cursor position. Found.
+        if fromElement == self.parent:
             cursor.set(self, len(self.tqchildren))
 
         # We already owned the cursor. Ask next child then.
@@ -154,8 +154,8 @@ class SequenceElement (BasicElement):
                     self.tqchildren[cursor.pos()-1].moveLeft(cursor, self)
             else:
                 # Needed because FormulaElement derives this.
-                if self.tqparent != None:
-                    self.tqparent.moveLeft(cursor, self)
+                if self.parent != None:
+                    self.parent.moveLeft(cursor, self)
 
         # The cursor came from one of our tqchildren or
         # something is wrong.
@@ -169,8 +169,8 @@ class SequenceElement (BasicElement):
     
     def moveRight(self, cursor, fromElement):
 
-        # Our tqparent asks us for a cursor position. Found.
-        if fromElement == self.tqparent:
+        # Our parent asks us for a cursor position. Found.
+        if fromElement == self.parent:
             cursor.set(self, 0)
 
         # We already owned the cursor. Ask next child then.
@@ -182,8 +182,8 @@ class SequenceElement (BasicElement):
                     self.tqchildren[cursor.pos()].moveRight(cursor, self)
             else:
                 # Needed because FormulaElement derives this.
-                if self.tqparent != None:
-                    self.tqparent.moveRight(cursor, self)
+                if self.parent != None:
+                    self.parent.moveRight(cursor, self)
 
         # The cursor came from one of our tqchildren or
         # something is wrong.
@@ -196,27 +196,27 @@ class SequenceElement (BasicElement):
                     
 
     def moveUp(self, cursor, fromElement):
-        if fromElement == self.tqparent:
+        if fromElement == self.parent:
             self.moveRight(cursor, self)
         else:
-            if self.tqparent != None:
-                self.tqparent.moveUp(cursor, self)
+            if self.parent != None:
+                self.parent.moveUp(cursor, self)
 
 
     def moveDown(self, cursor, fromElement):
-        if fromElement == self.tqparent:
+        if fromElement == self.parent:
             self.moveRight(cursor, self)
         else:
-            if self.tqparent != None:
-                self.tqparent.moveDown(cursor, self)
+            if self.parent != None:
+                self.parent.moveDown(cursor, self)
             
 
     def moveHome(self, cursor):
         if cursor.isSelection():
             element = cursor.element()
             if element != self:
-                while element.tqparent != self:
-                    element = element.tqparent
+                while element.parent != self:
+                    element = element.parent
                 cursor.setMarkPos(self.tqchildren.index(element)+1)
         cursor.set(self, 0)
 
@@ -224,8 +224,8 @@ class SequenceElement (BasicElement):
         if cursor.isSelection():
             element = cursor.element()
             if element != self:
-                while element.tqparent != self:
-                    element = element.tqparent
+                while element.parent != self:
+                    element = element.parent
                 cursor.setMarkPos(self.tqchildren.index(element))
         cursor.set(self, len(self.tqchildren))
 
@@ -279,7 +279,7 @@ class SequenceElement (BasicElement):
     def setMainChild(self, sequenceElement):
         if len(self.tqchildren) > 0:
             self.tqchildren[0] = sequenceElement
-            sequenceElement.tqparent = self
+            sequenceElement.parent = self
         else:
             self.addChild(sequenceElement)
 
@@ -292,9 +292,9 @@ class SequenceElement (BasicElement):
         the cursor) with the given element. The replaced sequence
         becomes the main child of the new element."""
 
-        # it is essential to set up the tqparent pointer for
+        # it is essential to set up the parent pointer for
         # the notification to work.
-        element.tqparent = self
+        element.parent = self
         
         seq = element.makeSequence()
         if cursor.isSelection():
@@ -319,7 +319,7 @@ class SequenceElement (BasicElement):
     def replaceElementByMainChild(self, cursor, element):
         """Replaces the given element with the content of its main child.
         (The main child is always a SequenceElement.)"""
-        assert element.tqparent == self
+        assert element.parent == self
         self.formula().elementRemoved(element)
         
         seq = element.mainChild()
@@ -327,7 +327,7 @@ class SequenceElement (BasicElement):
         self.tqchildren.remove(element)
         for child in seq.tqchildren:
             self.tqchildren.insert(pos, child)
-            child.tqparent = self
+            child.parent = self
             pos += 1
         cursor.set(self, pos)
         self.formula().changed()
@@ -335,7 +335,7 @@ class SequenceElement (BasicElement):
 
     def addChild(self, element):
         self.tqchildren.append(element)
-        element.tqparent = self
+        element.parent = self
         self.formula().changed()
 
     def insertChild(self, cursor, element):
@@ -343,7 +343,7 @@ class SequenceElement (BasicElement):
         The cursor is placed behind the new element."""
         pos = cursor.pos()
         self.tqchildren.insert(pos, element)
-        element.tqparent = self
+        element.parent = self
         cursor.set(self, pos+1)
         self.formula().changed()
         
@@ -351,7 +351,7 @@ class SequenceElement (BasicElement):
         """Replaces the element before the cursor with the new one.
         No range checking. Be careful."""
         self.tqchildren[cursor.pos()-1] = element
-        element.tqparent = self
+        element.parent = self
         self.formula().changed()
 
     def removeChild(self, cursor, element):
@@ -359,8 +359,8 @@ class SequenceElement (BasicElement):
         cursor.set(self, self.tqchildren.index(element))
         self.tqchildren.remove(element)
         if len(self.tqchildren) == 0:
-            if self.tqparent != None:
-                self.tqparent.removeChild(cursor, self)
+            if self.parent != None:
+                self.parent.removeChild(cursor, self)
                 return
         self.formula().changed()
         
@@ -380,8 +380,8 @@ class SequenceElement (BasicElement):
             self.formula().changed()
         else:
             if len(self.tqchildren) == 0:
-                if self.tqparent != None:
-                    self.tqparent.removeChild(cursor, self)
+                if self.parent != None:
+                    self.parent.removeChild(cursor, self)
             
     def removeChildBefore(self, cursor):
         pos = cursor.pos()-1
@@ -400,8 +400,8 @@ class SequenceElement (BasicElement):
             self.formula().changed()
         else:
             if len(self.tqchildren) == 0:
-                if self.tqparent != None:
-                    self.tqparent.removeChild(cursor, self)
+                if self.parent != None:
+                    self.parent.removeChild(cursor, self)
         
     
     def globalCursorPos(self, pos):
@@ -426,7 +426,7 @@ class SequenceElement (BasicElement):
 class FormulaElement (SequenceElement):
     """The main element.
     A formula consists of a FormulaElement and its tqchildren.
-    The only element that has no tqparent."""
+    The only element that has no parent."""
 
     def __init__(self, document):
         SequenceElement.__init__(self, None)
@@ -452,15 +452,15 @@ class FormulaElement (SequenceElement):
 class TextElement (BasicElement):
     """One char."""
     
-    def __init__(self, tqparent, char):
-        BasicElement.__init__(self, tqparent)
+    def __init__(self, parent, char):
+        BasicElement.__init__(self, parent)
         self.char = char
 
     def moveLeft(self, cursor, fromElement):
-        self.tqparent.moveLeft(cursor, self)
+        self.parent.moveLeft(cursor, self)
         
     def moveRight(self, cursor, fromElement):
-        self.tqparent.moveRight(cursor, self)
+        self.parent.moveRight(cursor, self)
 
     def draw(self, painter, styleContext, startPoint):
         styleContext.setupPainter(painter)
@@ -480,8 +480,8 @@ class IndexElement (BasicElement):
 
     def __init__(self, contentElement):
         if contentElement != None:
-            BasicElement.__init__(self, contentElement.tqparent)
-            contentElement.tqparent = self
+            BasicElement.__init__(self, contentElement.parent)
+            contentElement.parent = self
         else:
             BasicElement.__init__(self, None)
             
@@ -525,9 +525,9 @@ class IndexElement (BasicElement):
         assert fromElement != None
 
         if cursor.isSelection():
-            self.tqparent.moveLeft(cursor, self)
+            self.parent.moveLeft(cursor, self)
             
-        elif fromElement == self.tqparent:
+        elif fromElement == self.parent:
             if self.lowerRight != None:
                 self.lowerRight.moveLeft(cursor, self)
             elif self.upperRight != None:
@@ -550,25 +550,25 @@ class IndexElement (BasicElement):
             elif self.upperLeft != None:
                 self.upperLeft.moveLeft(cursor, self)
             else:
-                self.tqparent.moveLeft(cursor, self)
+                self.parent.moveLeft(cursor, self)
 
         elif fromElement == self.lowerLeft:
             if self.upperLeft != None:
                 self.upperLeft.moveLeft(cursor, self)
             else:
-                self.tqparent.moveLeft(cursor, self)
+                self.parent.moveLeft(cursor, self)
                 
         else:
-            self.tqparent.moveLeft(cursor, self)
+            self.parent.moveLeft(cursor, self)
             
         
     def moveRight(self, cursor, fromElement):
         assert fromElement != None
 
         if cursor.isSelection():
-            self.tqparent.moveRight(cursor, self)
+            self.parent.moveRight(cursor, self)
 
-        elif fromElement == self.tqparent:
+        elif fromElement == self.parent:
             if self.upperLeft != None:
                 self.upperLeft.moveRight(cursor, self)
             elif self.lowerLeft != None:
@@ -591,26 +591,26 @@ class IndexElement (BasicElement):
             elif self.lowerRight != None:
                 self.lowerRight.moveRight(cursor, self)
             else:
-                self.tqparent.moveRight(cursor, self)
+                self.parent.moveRight(cursor, self)
 
         elif fromElement == self.upperRight:
             if self.lowerRight != None:
                 self.lowerRight.moveRight(cursor, self)
             else:
-                self.tqparent.moveRight(cursor, self)
+                self.parent.moveRight(cursor, self)
                 
         else:
-            self.tqparent.moveRight(cursor, self)
+            self.parent.moveRight(cursor, self)
 
 
     def moveUp(self, cursor, fromElement):
         assert fromElement != None
 
-        if fromElement == self.tqparent:
+        if fromElement == self.parent:
             self.content.moveRight(cursor, self)
 
         elif fromElement == self.upperLeft or fromElement == self.upperRight:
-            self.tqparent.moveUp(cursor, self)
+            self.parent.moveUp(cursor, self)
 
         elif fromElement == self.content:
             if self.upperRight != None:
@@ -619,7 +619,7 @@ class IndexElement (BasicElement):
                 #self.upperLeft.moveRight(cursor, self)
                 self.upperLeft.moveLeft(cursor, self)
             else:
-                self.tqparent.moveUp(cursor, self)
+                self.parent.moveUp(cursor, self)
 
         elif fromElement == self.lowerLeft:
             self.content.moveRight(cursor, self)
@@ -628,17 +628,17 @@ class IndexElement (BasicElement):
             self.content.moveLeft(cursor, self)
 
         else: # should never happen.
-            self.tqparent.moveUp(cursor, self)
+            self.parent.moveUp(cursor, self)
                 
 
     def moveDown(self, cursor, fromElement):
         assert fromElement != None
 
-        if fromElement == self.tqparent:
+        if fromElement == self.parent:
             self.content.moveRight(cursor, self)
 
         elif fromElement == self.lowerLeft or fromElement == self.lowerRight:
-            self.tqparent.moveDown(cursor, fromElement)
+            self.parent.moveDown(cursor, fromElement)
 
         elif fromElement == self.content:
             if self.lowerRight != None:
@@ -647,7 +647,7 @@ class IndexElement (BasicElement):
                 #self.lowerLeft.moveRight(cursor, self)
                 self.lowerLeft.moveLeft(cursor, self)
             else:
-                self.tqparent.moveDown(cursor, self)
+                self.parent.moveDown(cursor, self)
 
         elif fromElement == self.upperLeft:
             self.content.moveRight(cursor, self)
@@ -656,7 +656,7 @@ class IndexElement (BasicElement):
             self.content.moveLeft(cursor, self)
             
         else: # should never happen.
-            self.tqparent.moveDown(cursor, self)
+            self.parent.moveDown(cursor, self)
 
             
     def draw(self, painter, styleContext, startPoint):
@@ -783,7 +783,7 @@ class IndexElement (BasicElement):
 
     def setMainChild(self, sequenceElement):
         self.content = sequenceElement
-        self.content.tqparent = self
+        self.content.parent = self
         self.formula().changed()
 
     def removeChild(self, cursor, element):
@@ -804,12 +804,12 @@ class IndexElement (BasicElement):
             self.content.moveLeft(cursor, self)
             self.lowerRight = None
         elif element == self.content:
-            self.tqparent.removeChild(cursor, self)
+            self.parent.removeChild(cursor, self)
             return
 
         if self.upperLeft == None and self.lowerLeft == None and \
            self.upperRight == None and self.lowerRight == None:
-            self.tqparent.replaceElementByMainChild(cursor, self)
+            self.parent.replaceElementByMainChild(cursor, self)
         else:
             self.formula().changed()
         
@@ -876,7 +876,7 @@ class Cursor:
         return self.currentMarkPos
     
     def setMarkPos(self, markPos):
-        """Gets called by elements if the cursor moves up to the tqparent."""
+        """Gets called by elements if the cursor moves up to the parent."""
         self.selectionFlag = (markPos != -1)
         self.currentMarkPos = markPos
         
@@ -916,10 +916,10 @@ class Cursor:
         if isinstance(element, IndexElement):
             return element
         if self.pos() == self.sequenceElement.countChildren():
-            tqparent = self.sequenceElement.tqparent
-            if isinstance(tqparent, IndexElement):
-                if self.sequenceElement == tqparent.mainChild():
-                    return tqparent
+            parent = self.sequenceElement.parent
+            if isinstance(parent, IndexElement):
+                if self.sequenceElement == parent.mainChild():
+                    return parent
 
                 
     def addUpperRightIndex(self):
@@ -929,7 +929,7 @@ class Cursor:
             self.sequenceElement.replaceCurrentSelection(self, indexElement)
         index = indexElement.requireUpperRight()
 
-        index.moveRight(self, index.tqparent)
+        index.moveRight(self, index.parent)
 
     
     def addLowerRightIndex(self):
@@ -939,7 +939,7 @@ class Cursor:
             self.sequenceElement.replaceCurrentSelection(self, indexElement)
         index = indexElement.requireLowerRight()
 
-        index.moveRight(self, index.tqparent)
+        index.moveRight(self, index.parent)
         
 
     def addTextElement(self, char):
@@ -1018,8 +1018,8 @@ class Cursor:
         formula = self.sequenceElement.formula()
         element = formula.elementAt(mouseEvent.pos(), QPoint(0, 0))
         if element != None:
-            if element.tqparent != None:
-                element.moveLeft(self, element.tqparent)
+            if element.parent != None:
+                element.moveLeft(self, element.parent)
                 self.selectionFlag = 0
                 self.mouseMarkFlag = 1
                 self.setMarkPos(self.pos())
@@ -1034,8 +1034,8 @@ class Cursor:
         formula = self.sequenceElement.formula()
         element = formula.elementAt(mouseEvent.pos(), QPoint(0, 0))
         if element != None:
-            if element.tqparent != None:
-                element.tqparent.moveLeft(self, element)
+            if element.parent != None:
+                element.parent.moveLeft(self, element)
     
 
     def elementRemoved(self, element):
@@ -1046,10 +1046,10 @@ class Cursor:
             if e == element:
                 # This is meant to catch all cursors that did not
                 # cause the deletion.
-                e.tqparent.moveRight(self, e)
+                e.parent.moveRight(self, e)
                 self.sequenceElement.moveHome(self)
                 return
-            e = e.tqparent
+            e = e.parent
         
 
 class StyleContext:
diff --git a/lib/kformula/prototype/unicode.py b/lib/kformula/prototype/unicode.py
index 2265635aa..585574cf4 100755
--- a/lib/kformula/prototype/unicode.py
+++ b/lib/kformula/prototype/unicode.py
@@ -5,8 +5,8 @@ from qt import *
 from xml.sax import saxutils, handler, make_parser
 
 class Form1(QWidget):
-    def __init__(self,tqparent = None,name = None,fl = 0):
-        QWidget.__init__(self,tqparent,name,fl)
+    def __init__(self,parent = None,name = None,fl = 0):
+        QWidget.__init__(self,parent,name,fl)
 
         if name == None:
             self.setName('Form1')
diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cc
index f9331f135..5adeb51cd 100644
--- a/lib/kformula/rootelement.cc
+++ b/lib/kformula/rootelement.cc
@@ -38,7 +38,7 @@ class RootSequenceElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
 
-    RootSequenceElement( BasicElement* tqparent = 0 ) : SequenceElement( tqparent ) {}
+    RootSequenceElement( BasicElement* parent = 0 ) : SequenceElement( parent ) {}
     virtual RootSequenceElement* clone() {
         return new RootSequenceElement( *this );
     }
@@ -92,8 +92,8 @@ KCommand* RootSequenceElement::buildCommand( Container* container, Request* requ
 }
 
 
-RootElement::RootElement(BasicElement* tqparent)
-    : BasicElement(tqparent)
+RootElement::RootElement(BasicElement* parent)
+    : BasicElement(parent)
 {
     content = new RootSequenceElement( this );
     index = 0;
@@ -235,7 +235,7 @@ void RootElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void RootElement::draw( TQPainter& painter, const LuPixelRect& r,
diff --git a/lib/kformula/rootelement.h b/lib/kformula/rootelement.h
index 4908a643a..1eacf4d4a 100644
--- a/lib/kformula/rootelement.h
+++ b/lib/kformula/rootelement.h
@@ -38,7 +38,7 @@ public:
 
     //enum { contentPos, indexPos };
 
-    RootElement(BasicElement* tqparent = 0);
+    RootElement(BasicElement* parent = 0);
     ~RootElement();
 
     RootElement( const RootElement& );
@@ -75,7 +75,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -231,16 +231,16 @@ private:
 
     class RootElementIndex : public ElementIndex {
     public:
-        RootElementIndex(RootElement* p) : tqparent(p) {}
+        RootElementIndex(RootElement* p) : parent(p) {}
         virtual void moveToIndex(FormulaCursor* cursor, Direction direction)
-            { tqparent->moveToIndex(cursor, direction); }
+            { parent->moveToIndex(cursor, direction); }
         virtual void setToIndex(FormulaCursor* cursor)
-            { tqparent->setToIndex(cursor); }
+            { parent->setToIndex(cursor); }
         virtual bool hasIndex() const
-            { return tqparent->hasIndex(); }
-        virtual RootElement* getElement() { return tqparent; }
+            { return parent->hasIndex(); }
+        virtual RootElement* getElement() { return parent; }
     protected:
-        RootElement* tqparent;
+        RootElement* parent;
     };
 
 
diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc
index 78a95d951..93293db79 100644
--- a/lib/kformula/sequenceelement.cc
+++ b/lib/kformula/sequenceelement.cc
@@ -72,8 +72,8 @@ void SequenceElement::setStyle( StyleElement *st )
     style = st;
 }
 
-SequenceElement::SequenceElement(BasicElement* tqparent)
-        : BasicElement(tqparent), parseTree(0), textSequence(true),singlePipe(true), style(0)
+SequenceElement::SequenceElement(BasicElement* parent)
+        : BasicElement(parent), parseTree(0), textSequence(true),singlePipe(true), style(0)
 {
     assert( creationStrategy != 0 );
     tqchildren.setAutoDelete(true);
@@ -247,7 +247,7 @@ void SequenceElement::setChildrenPositions()
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void SequenceElement::draw( TQPainter& painter, const LuPixelRect& r,
@@ -449,7 +449,7 @@ luPixel SequenceElement::getChildPosition( const ContextStyle& context, uint chi
  */
 void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from)
 {
-    // Our tqparent asks us for a cursor position. Found.
+    // Our parent asks us for a cursor position. Found.
     if (from == getParent()) {
         cursor->setTo(this, tqchildren.count());
         if ( cursor->isSelectionMode() ) {
@@ -502,7 +502,7 @@ void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from)
  */
 void SequenceElement::moveRight(FormulaCursor* cursor, BasicElement* from)
 {
-    // Our tqparent asks us for a cursor position. Found.
+    // Our parent asks us for a cursor position. Found.
     if (from == getParent()) {
         cursor->setTo(this, 0);
         from->entered( this );
@@ -741,8 +741,8 @@ bool SequenceElement::insert( uint index, BasicElement *child )
 //     tqchildren.remove(pos);
 //     /*
 //         if len(self.tqchildren) == 0:
-//             if self.tqparent != None:
-//                 self.tqparent.removeChild(cursor, self)
+//             if self.parent != None:
+//                 self.parent.removeChild(cursor, self)
 //                 return
 //     */
 //     formula()->changed();
@@ -1411,11 +1411,11 @@ void SequenceElement::getChildrenDom( TQDomDocument& doc, TQDomElement elem,
 /**
  * Stores the given tqchildrens MathML dom in the element.
  */
-void SequenceElement::getChildrenMathMLDom( TQDomDocument& doc, TQDomNode& tqparent,
+void SequenceElement::getChildrenMathMLDom( TQDomDocument& doc, TQDomNode& parent,
                                             uint from, uint to)
 {
     for ( uint i = from; i < to; i++ ) {
-        tqchildren.at( i )->writeMathML( doc, tqparent, false );
+        tqchildren.at( i )->writeMathML( doc, parent, false );
     }
 }
 
@@ -1522,7 +1522,7 @@ void SequenceElement::parse()
     parseTree = parser.parse(tqchildren);
 
     // With the IndexElement dynamically changing its text/non-text
-    // behaviour we need to reparse your tqparent, too. Hacky!
+    // behaviour we need to reparse your parent, too. Hacky!
     BasicElement* p = getParent();
     if ( p != 0 ) {
         SequenceElement* seq = dynamic_cast<SequenceElement*>( p->getParent() );
@@ -1600,8 +1600,8 @@ int SequenceElement::childPos( const BasicElement* child ) const
 }
 
 
-NameSequence::NameSequence( BasicElement* tqparent )
-    : SequenceElement( tqparent )
+NameSequence::NameSequence( BasicElement* parent )
+    : SequenceElement( parent )
 {
 }
 
diff --git a/lib/kformula/sequenceelement.h b/lib/kformula/sequenceelement.h
index 9696d3adb..4d32153c5 100644
--- a/lib/kformula/sequenceelement.h
+++ b/lib/kformula/sequenceelement.h
@@ -41,7 +41,7 @@ class SequenceElement : public BasicElement {
     SequenceElement& operator=( const SequenceElement& ) { return *this; }
 public:
 
-    SequenceElement(BasicElement* tqparent = 0);
+    SequenceElement(BasicElement* parent = 0);
     ~SequenceElement();
 
     SequenceElement( const SequenceElement& );
@@ -101,7 +101,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -493,7 +493,7 @@ class NameSequence : public SequenceElement {
     typedef SequenceElement inherited;
 public:
 
-    NameSequence( BasicElement* tqparent = 0 );
+    NameSequence( BasicElement* parent = 0 );
 
     virtual NameSequence* clone() {
         return new NameSequence( *this );
diff --git a/lib/kformula/spaceelement.cc b/lib/kformula/spaceelement.cc
index f3f43d1c9..a7e23464c 100644
--- a/lib/kformula/spaceelement.cc
+++ b/lib/kformula/spaceelement.cc
@@ -33,8 +33,8 @@
 KFORMULA_NAMESPACE_BEGIN
 
 
-SpaceElement::SpaceElement( SpaceWidth space, bool tab, BasicElement* tqparent )
-    : BasicElement( tqparent ), 
+SpaceElement::SpaceElement( SpaceWidth space, bool tab, BasicElement* parent )
+    : BasicElement( parent ), 
       m_tab( tab ),
       m_widthType( NoSize ),
       m_heightType( NoSize ),
diff --git a/lib/kformula/spaceelement.h b/lib/kformula/spaceelement.h
index 856af25ee..a8c5ec9a2 100644
--- a/lib/kformula/spaceelement.h
+++ b/lib/kformula/spaceelement.h
@@ -48,7 +48,7 @@ class SpaceElement : public BasicElement {
     SpaceElement operator=( const SpaceElement& ) { return *this; }
 public:
 
-    SpaceElement( SpaceWidth space = THIN, bool tab=false, BasicElement* tqparent = 0 );
+    SpaceElement( SpaceWidth space = THIN, bool tab=false, BasicElement* parent = 0 );
     SpaceElement( const SpaceElement& );
 
     virtual SpaceElement* clone() {
@@ -87,7 +87,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
diff --git a/lib/kformula/stringelement.cc b/lib/kformula/stringelement.cc
index 2f13ad77f..e98510331 100644
--- a/lib/kformula/stringelement.cc
+++ b/lib/kformula/stringelement.cc
@@ -22,7 +22,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-StringElement::StringElement( BasicElement* tqparent ) : TokenElement( tqparent ) 
+StringElement::StringElement( BasicElement* parent ) : TokenElement( parent ) 
 {
 }
 
diff --git a/lib/kformula/stringelement.h b/lib/kformula/stringelement.h
index 447895db9..6195fa45a 100644
--- a/lib/kformula/stringelement.h
+++ b/lib/kformula/stringelement.h
@@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN
 class StringElement : public TokenElement {
     typedef TokenElement inherited;
 public:
-    StringElement( BasicElement* tqparent = 0 );
+    StringElement( BasicElement* parent = 0 );
 	virtual int buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDomNode n);
 
 protected:
diff --git a/lib/kformula/styleelement.cc b/lib/kformula/styleelement.cc
index fc61386cb..3bb6b6b14 100644
--- a/lib/kformula/styleelement.cc
+++ b/lib/kformula/styleelement.cc
@@ -22,7 +22,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-StyleElement::StyleElement( BasicElement* tqparent ) : TokenStyleElement( tqparent ),
+StyleElement::StyleElement( BasicElement* parent ) : TokenStyleElement( parent ),
                                                      m_scriptMinSizeType( NoSize ),
                                                      m_veryVeryThinMathSpaceType( NoSize ),
                                                      m_veryThinMathSpaceType( NoSize ),
@@ -88,7 +88,7 @@ bool StyleElement::readAttributesFromMathMLDom( const TQDomElement& element )
     }
     TQString backgroundStr = element.attribute( "background" );
     if ( ! backgroundStr.isNull() ) {
-        // TODO: trantqparent background
+        // TODO: tranparent background
         m_customBackground = true;
         if ( backgroundStr[0] != '#' ) {
             m_background = TQColor( getHtmlColor( backgroundStr ) );
diff --git a/lib/kformula/styleelement.h b/lib/kformula/styleelement.h
index 7751a19aa..ffe932b15 100644
--- a/lib/kformula/styleelement.h
+++ b/lib/kformula/styleelement.h
@@ -29,7 +29,7 @@ class StyleElement : public TokenStyleElement {
     typedef TokenStyleElement inherited;
 public:
 	
-    StyleElement( BasicElement* tqparent = 0 );
+    StyleElement( BasicElement* parent = 0 );
 
 protected:
 
diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc
index 6a80eeec5..d5aa31766 100644
--- a/lib/kformula/symbolaction.cc
+++ b/lib/kformula/symbolaction.cc
@@ -101,16 +101,16 @@ void SymbolComboItem::paint( TQPainter *p )
 /*
  * The symbol action *
  */
-SymbolAction::SymbolAction( TQObject* tqparent, const char* name )
-    : KSelectAction( tqparent, name )
+SymbolAction::SymbolAction( TQObject* parent, const char* name )
+    : KSelectAction( parent, name )
 {
     setEditable( FALSE );
 }
 
 SymbolAction::SymbolAction( const TQString& text, const KShortcut& cut,
                             const TQObject* receiver, const char* slot,
-                            TQObject* tqparent, const char* name )
-    : KSelectAction( text, cut, receiver, slot, tqparent, name )
+                            TQObject* parent, const char* name )
+    : KSelectAction( text, cut, receiver, slot, parent, name )
 {
     setEditable( FALSE );
 }
diff --git a/lib/kformula/symbolaction.h b/lib/kformula/symbolaction.h
index a8e7eadf9..b31580142 100644
--- a/lib/kformula/symbolaction.h
+++ b/lib/kformula/symbolaction.h
@@ -32,9 +32,9 @@ KFORMULA_NAMESPACE_BEGIN
 class SymbolAction : public KSelectAction
 {
 public:
-    SymbolAction( TQObject* tqparent = 0, const char* name = 0 );
+    SymbolAction( TQObject* parent = 0, const char* name = 0 );
     SymbolAction( const TQString& text, const KShortcut& cut,
-                 const TQObject* receiver, const char* slot, TQObject* tqparent,
+                 const TQObject* receiver, const char* slot, TQObject* parent,
                  const char* name = 0 );
 
     int plug( TQWidget*, int index = -1 );
diff --git a/lib/kformula/symbolelement.cc b/lib/kformula/symbolelement.cc
index fb2eb69de..a601cea49 100644
--- a/lib/kformula/symbolelement.cc
+++ b/lib/kformula/symbolelement.cc
@@ -36,7 +36,7 @@ class SymbolSequenceElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
 
-    SymbolSequenceElement( BasicElement* tqparent = 0 ) : SequenceElement( tqparent ) {}
+    SymbolSequenceElement( BasicElement* parent = 0 ) : SequenceElement( parent ) {}
 
     /**
      * This is called by the container to get a command depending on
@@ -87,8 +87,8 @@ KCommand* SymbolSequenceElement::buildCommand( Container* container, Request* re
 }
 
 
-SymbolElement::SymbolElement(SymbolType type, BasicElement* tqparent)
-    : BasicElement(tqparent), symbol( 0 ), symbolType( type )
+SymbolElement::SymbolElement(SymbolType type, BasicElement* parent)
+    : BasicElement(parent), symbol( 0 ), symbolType( type )
 {
     content = new SymbolSequenceElement( this );
     upper = 0;
@@ -300,7 +300,7 @@ void SymbolElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void SymbolElement::draw( TQPainter& painter, const LuPixelRect& r,
@@ -586,9 +586,9 @@ void SymbolElement::remove(FormulaCursor* cursor,
         setToLower(cursor);
         break;
     case contentPos: {
-        BasicElement* tqparent = getParent();
-        tqparent->selectChild(cursor, this);
-        tqparent->remove(cursor, removedChildren, direction);
+        BasicElement* parent = getParent();
+        parent->selectChild(cursor, this);
+        parent->remove(cursor, removedChildren, direction);
         break;
     }
     }
@@ -852,7 +852,7 @@ TQString SymbolElement::formulaString()
     return sym + ")";
 }
 
-void SymbolElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const
+void SymbolElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const
 {
     TQDomElement de = doc.createElement( oasisFormat ? "math:mrow" : "mrow" );
     TQDomElement mo = doc.createElement( oasisFormat ? "math:mo" : "mo" );
@@ -900,7 +900,7 @@ void SymbolElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool o
     de.appendChild( between );
     content->writeMathML( doc, de, oasisFormat );
 
-    tqparent.appendChild( de );
+    parent.appendChild( de );
 }
 
 KFORMULA_NAMESPACE_END
diff --git a/lib/kformula/symbolelement.h b/lib/kformula/symbolelement.h
index 877c44935..0133258ea 100644
--- a/lib/kformula/symbolelement.h
+++ b/lib/kformula/symbolelement.h
@@ -36,7 +36,7 @@ public:
 
     //enum { contentPos, upperPos, lowerPos };
 
-    SymbolElement(SymbolType type = EmptyBracket, BasicElement* tqparent = 0);
+    SymbolElement(SymbolType type = EmptyBracket, BasicElement* parent = 0);
     ~SymbolElement();
 
     SymbolElement( const SymbolElement& );
@@ -74,7 +74,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -227,7 +227,7 @@ public:
 
     virtual TQString formulaString();
 
-    virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ;
+    virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ;
 
 protected:
 
@@ -263,34 +263,34 @@ private:
      */
     class SymbolElementIndex : public ElementIndex {
     public:
-        SymbolElementIndex(SymbolElement* p) : tqparent(p) {}
-        virtual SymbolElement* getElement() { return tqparent; }
+        SymbolElementIndex(SymbolElement* p) : parent(p) {}
+        virtual SymbolElement* getElement() { return parent; }
     protected:
-        SymbolElement* tqparent;
+        SymbolElement* parent;
     };
 
     // We have a (very simple) type for every index.
 
     class UpperIndex : public SymbolElementIndex {
     public:
-        UpperIndex(SymbolElement* tqparent) : SymbolElementIndex(tqparent) {}
+        UpperIndex(SymbolElement* parent) : SymbolElementIndex(parent) {}
         virtual void moveToIndex(FormulaCursor* cursor, Direction direction)
-            { tqparent->moveToUpper(cursor, direction); }
+            { parent->moveToUpper(cursor, direction); }
         virtual void setToIndex(FormulaCursor* cursor)
-            { tqparent->setToUpper(cursor); }
+            { parent->setToUpper(cursor); }
         virtual bool hasIndex() const
-            { return tqparent->hasUpper(); }
+            { return parent->hasUpper(); }
     };
 
     class LowerIndex : public SymbolElementIndex {
     public:
-        LowerIndex(SymbolElement* tqparent) : SymbolElementIndex(tqparent) {}
+        LowerIndex(SymbolElement* parent) : SymbolElementIndex(parent) {}
         virtual void moveToIndex(FormulaCursor* cursor, Direction direction)
-            { tqparent->moveToLower(cursor, direction); }
+            { parent->moveToLower(cursor, direction); }
         virtual void setToIndex(FormulaCursor* cursor)
-            { tqparent->setToLower(cursor); }
+            { parent->setToLower(cursor); }
         virtual bool hasIndex() const
-            { return tqparent->hasLower(); }
+            { return parent->hasLower(); }
     };
 
 
diff --git a/lib/kformula/textelement.cc b/lib/kformula/textelement.cc
index c42a6e2ff..c9826429e 100644
--- a/lib/kformula/textelement.cc
+++ b/lib/kformula/textelement.cc
@@ -37,8 +37,8 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-TextElement::TextElement(TQChar ch, bool beSymbol, BasicElement* tqparent)
-        : BasicElement(tqparent), character(ch), symbol(beSymbol)
+TextElement::TextElement(TQChar ch, bool beSymbol, BasicElement* parent)
+        : BasicElement(parent), character(ch), symbol(beSymbol)
 {
     charStyle( anyChar );
     charFamily( anyFamily );
@@ -156,7 +156,7 @@ void TextElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `parentOrigin' is the point this element's tqparent starts.
+ * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
 void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
@@ -351,9 +351,9 @@ const SymbolTable& TextElement::getSymbolTable() const
 }
 
 
-void TextElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool ) const
+void TextElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool ) const
 {
-    tqparent.appendChild( doc.createTextNode( getCharacter() ) );
+    parent.appendChild( doc.createTextNode( getCharacter() ) );
 }
 
 /**
@@ -501,8 +501,8 @@ TQString TextElement::formulaString()
 }
 
 
-EmptyElement::EmptyElement( BasicElement* tqparent )
-    : BasicElement( tqparent )
+EmptyElement::EmptyElement( BasicElement* parent )
+    : BasicElement( parent )
 {
 }
 
diff --git a/lib/kformula/textelement.h b/lib/kformula/textelement.h
index 48eb1d43d..99b6e63a2 100644
--- a/lib/kformula/textelement.h
+++ b/lib/kformula/textelement.h
@@ -38,7 +38,7 @@ class TextElement : public BasicElement {
     TextElement operator=( const TextElement& ) { return *this; }
 public:
 
-    TextElement(TQChar ch = ' ', bool beSymbol = false, BasicElement* tqparent = 0);
+    TextElement(TQChar ch = ' ', bool beSymbol = false, BasicElement* parent = 0);
     TextElement( const TextElement& );
 
     virtual TextElement* clone() {
@@ -82,7 +82,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -129,7 +129,7 @@ public:
 
     virtual TQString formulaString();
 
-    virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ;
+    virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ;
 
 protected:
 
@@ -226,7 +226,7 @@ class EmptyElement : public BasicElement {
     EmptyElement& operator=( const EmptyElement& ) { return *this; }
 public:
 
-    EmptyElement( BasicElement* tqparent = 0 );
+    EmptyElement( BasicElement* parent = 0 );
     EmptyElement( const EmptyElement& );
 
     virtual EmptyElement* clone() {
@@ -253,7 +253,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cc
index bb63c05f9..272af51fb 100644
--- a/lib/kformula/tokenelement.cc
+++ b/lib/kformula/tokenelement.cc
@@ -38,7 +38,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-TokenElement::TokenElement( BasicElement* tqparent ) : TokenStyleElement( tqparent ),
+TokenElement::TokenElement( BasicElement* parent ) : TokenStyleElement( parent ),
                                                      m_textOnly( true )
 {
 }
diff --git a/lib/kformula/tokenelement.h b/lib/kformula/tokenelement.h
index 9982225b6..571cc247e 100644
--- a/lib/kformula/tokenelement.h
+++ b/lib/kformula/tokenelement.h
@@ -30,7 +30,7 @@ KFORMULA_NAMESPACE_BEGIN
 class TokenElement : public TokenStyleElement {
     typedef TokenStyleElement inherited;
 public:
-    TokenElement( BasicElement* tqparent = 0 );
+    TokenElement( BasicElement* parent = 0 );
 
 	virtual int buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDomNode n);
 
diff --git a/lib/kformula/tokenstyleelement.cc b/lib/kformula/tokenstyleelement.cc
index 3b1e6224b..c8e4799fd 100644
--- a/lib/kformula/tokenstyleelement.cc
+++ b/lib/kformula/tokenstyleelement.cc
@@ -24,7 +24,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-TokenStyleElement::TokenStyleElement( BasicElement* tqparent ) : SequenceElement( tqparent ),
+TokenStyleElement::TokenStyleElement( BasicElement* parent ) : SequenceElement( parent ),
                                                      m_mathSizeType ( NoSize ),
                                                      m_charStyle( anyChar ),
                                                      m_charFamily( anyFamily ),
diff --git a/lib/kformula/tokenstyleelement.h b/lib/kformula/tokenstyleelement.h
index 3e601ca88..3789a0f4d 100644
--- a/lib/kformula/tokenstyleelement.h
+++ b/lib/kformula/tokenstyleelement.h
@@ -36,7 +36,7 @@ class TokenStyleElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
 
-    TokenStyleElement( BasicElement* tqparent = 0 );
+    TokenStyleElement( BasicElement* parent = 0 );
 
     virtual void calcSizes( const ContextStyle& context,
                             ContextStyle::TextStyle tstyle,
diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp
index 8394f59a7..41dfee8f2 100644
--- a/lib/kofficecore/KoChild.cpp
+++ b/lib/kofficecore/KoChild.cpp
@@ -50,8 +50,8 @@ public:
   int m_contentsY;
 };
 
-KoChild::KoChild( TQObject *tqparent, const char *name )
-: TQObject( tqparent, name )
+KoChild::KoChild( TQObject *parent, const char *name )
+: TQObject( parent, name )
 {
   d = new KoChildPrivate;
 
diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h
index 0dbc74be0..b7285deb9 100644
--- a/lib/kofficecore/KoChild.h
+++ b/lib/kofficecore/KoChild.h
@@ -26,7 +26,7 @@
 /**
  * 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 tqparent.
+ * relative to the embedded document's parent.
  *
  * In detail it handles size, matrix operations and can give you
  * a clip region. It can deal with scaling, rotation etc. because it
@@ -56,7 +56,7 @@ public:
   enum Gadget { NoGadget, TopLeft, TopMid, TopRight, MidLeft, MidRight,
 		BottomLeft, BottomMid, BottomRight, Move };
 
-  KoChild( TQObject *tqparent = 0, const char *name = 0 );
+  KoChild( TQObject *parent = 0, const char *name = 0 );
   virtual ~KoChild();
 
   /**
@@ -69,7 +69,7 @@ public:
    * @return the rectangle that would be used to display this
    *         child document if the child is not rotated or
    *         subject to some other geometric transformation.
-   *         The rectangle is in the coordinate system of the tqparent,
+   *         The rectangle is in the coordinate system of the parent,
    *         using unzoomed coordinates in points.
    *
    * @see #setGeometry
@@ -78,7 +78,7 @@ public:
 
   /**
    * @return the region of this child part relative to the
-   *         coordinate system of the tqparent.
+   *         coordinate system of the parent.
    *         The region is transformed with the passed
    *         matrix.
    */
@@ -86,7 +86,7 @@ public:
 
   /**
    * @return the polygon which surrounds the child part. The points
-   *         are in coordinates of the tqparent.
+   *         are in coordinates of the parent.
    *         The points are transformed with the
    *         passed matrix.
    */
@@ -94,14 +94,14 @@ public:
 
   /**
    * Tests whether the part contains a certain point. The point is
-   * in the coordinate system of the tqparent.
+   * in the coordinate system of the parent.
    */
   //virtual bool contains( const TQPoint& ) const;
 
   /**
    * @return the effective bounding rect after all transformations.
    *         The coordinates of the rectangle are in the coordinate system
-   *         of the tqparent.
+   *         of the parent.
    */
   TQRect boundingRect() const;
 
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index efddc96a6..233764895 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -81,9 +81,9 @@ class KoTemplatesPanePrivate
 };
 
 
-KoTemplatesPane::KoTemplatesPane(TQWidget* tqparent, KInstance* instance,
+KoTemplatesPane::KoTemplatesPane(TQWidget* parent, KInstance* instance,
                                  KoTemplateGroup *group, KoTemplate* /*defaultTemplate*/)
-  : KoDetailsPaneBase(tqparent, "TemplatesPane")
+  : KoDetailsPaneBase(parent, "TemplatesPane")
 {
   d = new KoTemplatesPanePrivate;
   d->m_instance = instance;
@@ -268,8 +268,8 @@ class KoRecentDocumentsPanePrivate
     KInstance* m_instance;
 };
 
-KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* tqparent, KInstance* instance)
-  : KoDetailsPaneBase(tqparent, "RecentDocsPane")
+KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instance)
+  : KoDetailsPaneBase(parent, "RecentDocsPane")
 {
   d = new KoRecentDocumentsPanePrivate;
   d->m_instance = instance;
diff --git a/lib/kofficecore/KoDetailsPane.h b/lib/kofficecore/KoDetailsPane.h
index bee6f14ac..7264cd788 100644
--- a/lib/kofficecore/KoDetailsPane.h
+++ b/lib/kofficecore/KoDetailsPane.h
@@ -40,7 +40,7 @@ class KoTemplatesPanePrivate;
 
 /**
  * This widget is the right-side part of the template opening widget.
- * The tqparent widget is initial widget in the document space of each KOffice component.
+ * The parent widget is initial widget in the document space of each KOffice component.
  * This widget shows a list of templates and can show their details or open it.
  */
 class KoTemplatesPane : public KoDetailsPaneBase
@@ -50,13 +50,13 @@ class KoTemplatesPane : public KoDetailsPaneBase
   public:
     /**
      * Constructor.
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param instance the instance object for the app
      * @param group the group of templates this widget will show.
      * @param defaultTemplate pointer to the default template. Used to select a
      * template when none has been selected before.
      */
-    KoTemplatesPane(TQWidget* tqparent, KInstance* instance,
+    KoTemplatesPane(TQWidget* parent, KInstance* instance,
                     KoTemplateGroup* group, KoTemplate* defaultTemplate);
     ~KoTemplatesPane();
 
@@ -91,7 +91,7 @@ class KoTemplatesPane : public KoDetailsPaneBase
 
 /**
  * This widget is the recent doc part of the template opening widget.
- * The tqparent widget is initial widget in the document space of each KOffice component.
+ * The parent widget is initial widget in the document space of each KOffice component.
  * This widget shows a list of recent documents and can show their details or open it.
  */
 class KoRecentDocumentsPane : public KoDetailsPaneBase
@@ -101,10 +101,10 @@ class KoRecentDocumentsPane : public KoDetailsPaneBase
   public:
     /**
      * Constructor.
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param instance the instance object for the app
      */
-    KoRecentDocumentsPane(TQWidget* tqparent, KInstance* instance);
+    KoRecentDocumentsPane(TQWidget* parent, KInstance* instance);
     ~KoRecentDocumentsPane();
 
     virtual bool eventFilter(TQObject* watched, TQEvent* e);
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index a579e9256..2bd0e3b45 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -165,8 +165,8 @@ public:
 class KoViewWrapperWidget : public TQWidget
 {
 public:
-    KoViewWrapperWidget( TQWidget *tqparent, const char *name )
-        : TQWidget( tqparent, name )
+    KoViewWrapperWidget( TQWidget *parent, const char *name )
+        : TQWidget( parent, name )
     {
         KGlobal::locale()->insertCatalogue("koffice");
         // Tell the iconloader about share/apps/koffice/icons
@@ -211,7 +211,7 @@ KoBrowserExtension::KoBrowserExtension( KoDocument * doc, const char * name )
 
 void KoBrowserExtension::print()
 {
-    KoDocument * doc = static_cast<KoDocument *>( tqparent() );
+    KoDocument * doc = static_cast<KoDocument *>( parent() );
     KoViewWrapperWidget * wrapper = static_cast<KoViewWrapperWidget *>( doc->widget() );
     KoView * view = wrapper->koView();
     // TODO remove code duplication (KoMainWindow), by moving this to KoView
@@ -222,8 +222,8 @@ void KoBrowserExtension::print()
         view->print( printer );
 }
 
-KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-    : KParts::ReadWritePart( tqparent, name )
+KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode )
+    : KParts::ReadWritePart( parent, name )
 {
     if(s_documentList==0L)
         s_documentList=new TQPtrList<KoDocument>;
@@ -236,12 +236,12 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec
     d->m_bSingleViewMode = singleViewMode;
 
 
-    // the tqparent setting *always* overrides! (Simon)
-    if ( tqparent )
+    // the parent setting *always* overrides! (Simon)
+    if ( parent )
     {
-        if ( tqparent->inherits( "KoDocument" ) )
-            d->m_bSingleViewMode = ((KoDocument *)tqparent)->isSingleViewMode();
-        else if ( tqparent->inherits( "KParts::Part" ) )
+        if ( parent->inherits( "KoDocument" ) )
+            d->m_bSingleViewMode = ((KoDocument *)parent)->isSingleViewMode();
+        else if ( parent->inherits( "KParts::Part" ) )
             d->m_bSingleViewMode = true;
     }
 
@@ -309,12 +309,12 @@ bool KoDocument::isSingleViewMode() const
 
 bool KoDocument::isEmbedded() const
 {
-    return dynamic_cast<KoDocument *>( tqparent() ) != 0;
+    return dynamic_cast<KoDocument *>( parent() ) != 0;
 }
 
-KoView *KoDocument::createView( TQWidget *tqparent, const char *name )
+KoView *KoDocument::createView( TQWidget *parent, const char *name )
 {
-    KoView *view=createViewInstance(tqparent, name);
+    KoView *view=createViewInstance(parent, name);
     addView(view);
     return view;
 }
@@ -2056,7 +2056,7 @@ int KoDocument::queryCloseExternalChildren()
 void KoDocument::setTitleModified( const TQString caption, bool mod )
 {
     //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" caption: "<<caption<<" mod: "<<mod<<endl;
-    KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() );
+    KoDocument *doc = dynamic_cast<KoDocument *>( parent() );
     if ( doc )
     {
         doc->setTitleModified( caption, mod );
@@ -2075,7 +2075,7 @@ void KoDocument::setTitleModified( const TQString caption, bool mod )
 void KoDocument::setTitleModified()
 {
     //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" extern: "<<isStoredExtern()<<" current: "<<d->m_current<<endl;
-    KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() );
+    KoDocument *doc = dynamic_cast<KoDocument *>( parent() );
     TQString caption;
     if ( (url().isEmpty() || isStoredExtern()) && d->m_current )
     {
@@ -2429,7 +2429,7 @@ TQString KoDocument::backupPath()const
 void KoDocument::setCurrent( bool on )
 {
     //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" set to: "<<on<<endl;
-    KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() );
+    KoDocument *doc = dynamic_cast<KoDocument *>( parent() );
     if ( doc )
     {
         if ( !isStoredExtern() )
@@ -2442,7 +2442,7 @@ void KoDocument::setCurrent( bool on )
         d->m_current = on;
         if ( !on )
         {
-            doc->setCurrent( true );    // let my next external tqparent take over
+            doc->setCurrent( true );    // let my next external parent take over
             return;
         }
         doc->forceCurrent( false ); // everybody else should keep off
@@ -2457,7 +2457,7 @@ void KoDocument::forceCurrent( bool on )
 {
     //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" force to: "<<on<<endl;
     d->m_current = on;
-    KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() );
+    KoDocument *doc = dynamic_cast<KoDocument *>( parent() );
     if ( doc )
     {
         doc->forceCurrent( false );
@@ -2542,7 +2542,7 @@ TQString KoDocument::unitName() const
     return KoUnit::unitName( unit() );
 }
 
-void KoDocument::showStartUpWidget( KoMainWindow* tqparent, bool alwaysShow )
+void KoDocument::showStartUpWidget( KoMainWindow* parent, bool alwaysShow )
 {
     if(!alwaysShow) {
         KConfigGroup cfgGrp( instance()->config(), "TemplateChooserDialog" );
@@ -2558,11 +2558,11 @@ void KoDocument::showStartUpWidget( KoMainWindow* tqparent, bool alwaysShow )
     if(d->m_startUpWidget){
         d->m_startUpWidget->show();
     } else {
-        d->m_startUpWidget = createOpenPane( tqparent->centralWidget(), instance(), templateType() );
+        d->m_startUpWidget = createOpenPane( parent->centralWidget(), instance(), templateType() );
     }
 
-    tqparent->setDocToOpen( this );
-    tqparent->factory()->container("mainToolBar", tqparent)->hide();
+    parent->setDocToOpen( this );
+    parent->factory()->container("mainToolBar", parent)->hide();
 }
 
 void KoDocument::openExistingFile( const TQString& file )
@@ -2600,10 +2600,10 @@ void KoDocument::startCustomDocument() {
     deleteOpenPane();
 }
 
-KoOpenPane* KoDocument::createOpenPane( TQWidget* tqparent, KInstance* instance,
+KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, KInstance* instance,
                                         const TQString& templateType )
 {
-    KoOpenPane* openPane = new KoOpenPane( tqparent, instance, templateType );
+    KoOpenPane* openPane = new KoOpenPane( parent, instance, templateType );
     TQWidget *customDoc = createCustomDocumentWidget(openPane);
     if(customDoc) {
         openPane->setCustomDocumentWidget( customDoc );
@@ -2648,13 +2648,13 @@ void KoDocument::deleteOpenPaneDelayed()
     d->m_startUpWidget = 0;
 }
 
-TQWidget* KoDocument::createCustomDocumentWidget(TQWidget */*tqparent*/) {
+TQWidget* KoDocument::createCustomDocumentWidget(TQWidget */*parent*/) {
     return 0;
 }
 
-bool KoDocument::showEmbedInitDialog(TQWidget* tqparent)
+bool KoDocument::showEmbedInitDialog(TQWidget* parent)
 {
-    KDialogBase dlg(tqparent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault);
+    KDialogBase dlg(parent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault);
     KoOpenPane* pane = createOpenPane(&dlg, instance(), templateType());
     pane->tqlayout()->setMargin(0);
     dlg.setMainWidget(pane);
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index 4051cca6e..ac6de7e8c 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -71,16 +71,16 @@ public:
      *  Constructor.
      * The first 4 arguments are the same as the ones passed to KParts::Factory::createPart.
      *
-     * @param parentWidget the tqparent widget, in case we create a wrapper widget
+     * @param parentWidget the parent widget, in case we create a wrapper widget
      *        (in single view mode).
      *        Usually the first argument passed by KParts::Factory::createPart.
      * @param widgetName name of the widget.
-     * @param tqparent may be another KoDocument, or anything else.
+     * @param parent may be another KoDocument, or anything else.
      *        Usually the third argument of KParts::Factory::createPart.
      * @param name is used to identify this document via DCOP so you may want to
      *        pass a meaningful name here which matches the pattern [A-Za-z_][A-Za-z_0-9]*.
      * @param singleViewMode determines whether the document may only have one view. In this case
-     *        the @p tqparent must be a TQWidget derived class. KoDocument will then create a wrapper widget
+     *        the @p parent must be a TQWidget derived class. KoDocument will then create a wrapper widget
      *        (KoViewWrapperWidget) which is a child of @p parentWidget.
      *        This widget can be retrieved by calling widget().
      *
@@ -88,7 +88,7 @@ public:
      */
     KoDocument( TQWidget* parentWidget,
                 const char* widgetName,
-                TQObject* tqparent,
+                TQObject* parent,
                 const char* name,
                 bool singleViewMode = false );
 
@@ -328,7 +328,7 @@ public:
     /**
      *  Create a new view for the document.
      */
-    KoView *createView( TQWidget *tqparent = 0, const char *name = 0 );
+    KoView *createView( TQWidget *parent = 0, const char *name = 0 );
 
     /**
      * Adds a view to the document.
@@ -465,11 +465,11 @@ public:
 
     /**
      * Creates and shows the start up widget.
-     * @param tqparent the KoMainWindow used as tqparent for the widget.
+     * @param parent the KoMainWindow used as parent for the widget.
      * @param alwaysShow always show the widget even if the user has configured it to not show.
      * @since 1.5
      */
-    virtual void showStartUpWidget(KoMainWindow* tqparent, bool alwaysShow = false);
+    virtual void showStartUpWidget(KoMainWindow* parent, bool alwaysShow = false);
 
     /**
      *  Sets the modified flag on the document. This means that it has
@@ -908,10 +908,10 @@ public:
 
     /**
      * Shows the init dialog when embeding
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @since 1.5
      */
-    virtual bool showEmbedInitDialog(TQWidget* tqparent);
+    virtual bool showEmbedInitDialog(TQWidget* parent);
 
 public slots:
     /**
@@ -988,7 +988,7 @@ protected:
 
     TQString autoSaveFile( const TQString & path ) const;
 
-    virtual KoView *createViewInstance( TQWidget *tqparent, const char *name ) = 0;
+    virtual KoView *createViewInstance( TQWidget *parent, const char *name ) = 0;
 
     /**
      *  Loads a document from KReadOnlyPart::m_file (KParts takes care of downloading
@@ -1016,9 +1016,9 @@ protected:
      * implement the logic to implement the document instance correctly.
      * After initializing the widget should emit a signal called 'documentSelected()' which
      * will remove the startupWidget and show the document.
-     * @param tqparent the tqparent of the to be created widget.
+     * @param parent the parent of the to be created widget.
      */
-    virtual TQWidget* createCustomDocumentWidget(TQWidget *tqparent);
+    virtual TQWidget* createCustomDocumentWidget(TQWidget *parent);
 
     /**
      *  OLD XML method. For OASIS just call KoDocumentChild::loadOasisDocument
@@ -1122,12 +1122,12 @@ protected:
 
     /**
      * Creates the open widget showed at application start up.
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param instance the KInstance to be used for KConfig data
      * @param templateType the template-type (group) that should be selected on creation.
      * @since 1.5
      */
-    KoOpenPane* createOpenPane( TQWidget* tqparent, KInstance* instance,
+    KoOpenPane* createOpenPane( TQWidget* parent, KInstance* instance,
                                 const TQString& templateType = TQString());
 
 private slots:
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 38c4439ae..0767ab049 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -67,11 +67,11 @@ public:
   bool m_deleted;
 };
 
-KoDocumentChild::KoDocumentChild( KoDocument* tqparent, KoDocument* doc, const TQRect& tqgeometry )
-    : KoChild( tqparent )
+KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry )
+    : KoChild( parent )
 {
   d = new KoDocumentChildPrivate;
-  d->m_parent = tqparent;
+  d->m_parent = parent;
   d->m_doc = doc;
   setGeometry( tqgeometry );
   d->m_deleted = false;
@@ -79,11 +79,11 @@ KoDocumentChild::KoDocumentChild( KoDocument* tqparent, KoDocument* doc, const T
     doc->setStoreInternal( !doc->hasExternURL() );
 }
 
-KoDocumentChild::KoDocumentChild( KoDocument* tqparent )
-    : KoChild( tqparent )
+KoDocumentChild::KoDocumentChild( KoDocument* parent )
+    : KoChild( parent )
 {
   d = new KoDocumentChildPrivate;
-  d->m_parent = tqparent;
+  d->m_parent = parent;
   d->m_doc = 0L;
   d->m_deleted = false;
 }
@@ -351,14 +351,14 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr
     // now :-)
     if ( parentDocument() )
     {
-        KoDocument *tqparent = parentDocument();
+        KoDocument *parent = parentDocument();
 
-        if ( tqparent->manager() && tqparent->manager()->parts() )
+        if ( parent->manager() && parent->manager()->parts() )
         {
-            KParts::PartManager *manager = tqparent->manager();
+            KParts::PartManager *manager = parent->manager();
 
             if ( !manager->parts()->containsRef( d->m_doc ) &&
-                 !tqparent->isSingleViewMode() )
+                 !parent->isSingleViewMode() )
                 manager->addPart( d->m_doc, false );
         }
     }
@@ -395,7 +395,7 @@ bool KoDocumentChild::saveOasis( KoStore* store, KoXmlWriter* manifestWriter )
     else
     {
         // The name comes from KoDocumentChild (which was set while saving the
-        // tqparent document).
+        // parent document).
         assert( d->m_doc->url().protocol() == INTERNAL_PROTOCOL );
         const TQString name = d->m_doc->url().path();
         kdDebug() << k_funcinfo << "saving " << name << endl;
diff --git a/lib/kofficecore/KoDocumentChild.h b/lib/kofficecore/KoDocumentChild.h
index 491f9b2d9..de3704c09 100644
--- a/lib/kofficecore/KoDocumentChild.h
+++ b/lib/kofficecore/KoDocumentChild.h
@@ -45,19 +45,19 @@ class KOFFICECORE_EXPORT KoDocumentChild : public KoChild
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoDocumentChild( KoDocument* tqparent, KoDocument* doc, const TQRect& tqgeometry );
+  KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry );
 
   /**
    * When using this constructor you must call @ref #setDocument before
    * you can call any other function of this class.
    */
-  KoDocumentChild( KoDocument* tqparent );
+  KoDocumentChild( KoDocument* parent );
 
   virtual ~KoDocumentChild();
 
   /**
    * Call this function only directly after calling the constructor
-   * that takes only a tqparent as argument.
+   * that takes only a parent as argument.
    */
   virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry );
 
@@ -69,7 +69,7 @@ public:
   KoDocument *document() const;
 
   /**
-   * @return tqparent document of this child
+   * @return parent document of this child
    *
    * @see KoDocument
    */
@@ -98,7 +98,7 @@ public:
 
   /**
    * Save an embedded object to OASIS.
-   * This method sets the attributes for the draw:object element in the tqparent XML document.
+   * This method sets the attributes for the draw:object element in the parent XML document.
    * It also prepares the embedded object for being saved into the store at
    * the end of saving (see saveOasisToStore).
    * Note that @p name is only used for "internal" documents (not extern).
@@ -107,7 +107,7 @@ public:
 
   /**
    * Save an embedded object to an OASIS store.
-   * This is called automatically by the tqparent KoDocument's saveOasis
+   * This is called automatically by the parent KoDocument's saveOasis
    */
   virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter );
 
diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp
index f6a3fe69a..cd4ecbafb 100644
--- a/lib/kofficecore/KoDocumentInfo.cpp
+++ b/lib/kofficecore/KoDocumentInfo.cpp
@@ -42,8 +42,8 @@
  *
  *****************************************/
 
-KoDocumentInfo::KoDocumentInfo( TQObject* tqparent, const char* name )
-    : TQObject( tqparent, name )
+KoDocumentInfo::KoDocumentInfo( TQObject* parent, const char* name )
+    : TQObject( parent, name )
 {
     (void)new KoDocumentInfoUserMetadata( this );
     (void)new KoDocumentInfoAuthor( this );
@@ -194,8 +194,8 @@ TQString KoDocumentInfo::creator() const
  *
  *****************************************/
 
-KoDocumentInfoPage::KoDocumentInfoPage( TQObject* tqparent, const char* name )
-    : TQObject( tqparent, name )
+KoDocumentInfoPage::KoDocumentInfoPage( TQObject* parent, const char* name )
+    : TQObject( parent, name )
 {
 }
 
@@ -634,7 +634,7 @@ KoDocumentInfoAbout::KoDocumentInfoAbout( KoDocumentInfo* info )
 
 void KoDocumentInfoAbout::saveParameters()
 {
-    KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->tqparent() );
+    KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->parent() );
     if ( m_firstSave && doc && !doc->isAutosaving() )
        m_editingCycles++;
     m_modificationDate = TQDateTime::tqcurrentDateTime();
diff --git a/lib/kofficecore/KoDocumentInfo.h b/lib/kofficecore/KoDocumentInfo.h
index b94a2de01..454763acf 100644
--- a/lib/kofficecore/KoDocumentInfo.h
+++ b/lib/kofficecore/KoDocumentInfo.h
@@ -41,7 +41,7 @@ class KOFFICECORE_EXPORT KoDocumentInfo : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoDocumentInfo( TQObject* tqparent = 0, const char* name = 0 );
+    KoDocumentInfo( TQObject* parent = 0, const char* name = 0 );
     virtual ~KoDocumentInfo();
 
     bool load( const TQDomDocument& doc );
@@ -67,7 +67,7 @@ public:
 class KOFFICECORE_EXPORT KoDocumentInfoPage : public TQObject
 {
 public:
-    KoDocumentInfoPage( TQObject *tqparent, const char* name );
+    KoDocumentInfoPage( TQObject *parent, const char* name );
 
     virtual bool load( const TQDomElement& e ) = 0;
     virtual TQDomElement save( TQDomDocument& doc ) = 0;
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index 786e3982f..f32616dd3 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -79,9 +79,9 @@ public:
   KDialogBase *m_dialog;
 };
 
-KoDocumentInfoDlg::KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *tqparent, const char *name,
+KoDocumentInfoDlg::KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *parent, const char *name,
                                       KDialogBase *dialog )
-: TQObject( tqparent, "docinfodlg" )
+: TQObject( parent, "docinfodlg" )
 {
   d = new KoDocumentInfoDlgPrivate;
   d->m_info = docInfo;
@@ -94,7 +94,7 @@ KoDocumentInfoDlg::KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *tqparen
     d->m_dialog = new KDialogBase( KDialogBase::Tabbed,
                                    i18n( "Document Information" ),
                                    KDialogBase::Ok | KDialogBase::Cancel,
-                                   KDialogBase::Ok, tqparent, name, true, false );
+                                   KDialogBase::Ok, parent, name, true, false );
     d->m_dialog->setInitialSize( TQSize( 500, 500 ) );
     d->m_bDeleteDialog = true;
   }
@@ -257,7 +257,7 @@ void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo )
   TQVBox *page = d->m_dialog->addVBoxPage( i18n( "General" ) );
   d->m_aboutWidget = new KoDocumentInfoAboutWidget( page );
   d->m_aboutWidget->pbReset->setIconSet( TQIconSet( KGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ) );
-  KoDocument* doc = dynamic_cast< KoDocument* >( d->m_info->tqparent() );
+  KoDocument* doc = dynamic_cast< KoDocument* >( d->m_info->parent() );
   if ( doc )
   {
     d->m_aboutWidget->leDocFile->setText( doc->file() );
diff --git a/lib/kofficecore/KoDocumentInfoDlg.h b/lib/kofficecore/KoDocumentInfoDlg.h
index d346c4c12..8589b6a06 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.h
+++ b/lib/kofficecore/KoDocumentInfoDlg.h
@@ -37,7 +37,7 @@ class KOFFICECORE_EXPORT KoDocumentInfoDlg : public TQObject
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *tqparent = 0, const char *name = 0,
+  KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *parent = 0, const char *name = 0,
 		     KDialogBase *dialog = 0 );
   virtual ~KoDocumentInfoDlg();
 
diff --git a/lib/kofficecore/KoDom.h b/lib/kofficecore/KoDom.h
index 688110f09..a88cb22dc 100644
--- a/lib/kofficecore/KoDom.h
+++ b/lib/kofficecore/KoDom.h
@@ -30,7 +30,7 @@
  *
  * To find all child elements with a given name, use
  * TQDomElement e;
- * forEachElement( e, tqparent )
+ * forEachElement( e, parent )
  * {
  *     if ( e.localName() == "..." && e.namespaceURI() == KoXmlNS::... )
  *     {
@@ -62,8 +62,8 @@ namespace KoDom {
 
 }
 
-#define forEachElement( elem, tqparent ) \
-      for ( TQDomNode _node = tqparent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \
+#define forEachElement( elem, parent ) \
+      for ( TQDomNode _node = parent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \
         if ( !( elem = _node.toElement() ).isNull() )
 
 #endif /* KODOM_H */
diff --git a/lib/kofficecore/KoFactory.cpp b/lib/kofficecore/KoFactory.cpp
index 9e6a4a182..cc89ac84d 100644
--- a/lib/kofficecore/KoFactory.cpp
+++ b/lib/kofficecore/KoFactory.cpp
@@ -31,8 +31,8 @@ public:
   }
 };
 
-KoFactory::KoFactory( TQObject *tqparent, const char *name )
-  : KParts::Factory( tqparent, name )
+KoFactory::KoFactory( TQObject *parent, const char *name )
+  : KParts::Factory( parent, name )
 {
   //d = new KoFactoryPrivate;
 }
diff --git a/lib/kofficecore/KoFactory.h b/lib/kofficecore/KoFactory.h
index e0d6b2b7e..7a8a5a87d 100644
--- a/lib/kofficecore/KoFactory.h
+++ b/lib/kofficecore/KoFactory.h
@@ -29,7 +29,7 @@ class KOFFICECORE_EXPORT KoFactory : public KParts::Factory
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoFactory( TQObject *tqparent = 0, const char *name = 0 );
+  KoFactory( TQObject *parent = 0, const char *name = 0 );
   virtual ~KoFactory();
 
 private:
diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp
index 9f581a4e2..2a7bd3158 100644
--- a/lib/kofficecore/KoFileDialog.cpp
+++ b/lib/kofficecore/KoFileDialog.cpp
@@ -26,9 +26,9 @@
 #include <kdebug.h>
 
 KoFileDialog::KoFileDialog(const TQString& startDir, const TQString& filter,
-                           TQWidget *tqparent, const char *name,
+                           TQWidget *parent, const char *name,
                            bool modal)
-    : KFileDialog( startDir, filter, tqparent, name, modal )
+    : KFileDialog( startDir, filter, parent, name, modal )
 {
     connect( filterWidget, TQT_SIGNAL( activated( int) ),
              this, TQT_SLOT( slotChangedfilter( int ) ) );
diff --git a/lib/kofficecore/KoFileDialog.h b/lib/kofficecore/KoFileDialog.h
index 1482bf362..7c702cac5 100644
--- a/lib/kofficecore/KoFileDialog.h
+++ b/lib/kofficecore/KoFileDialog.h
@@ -38,7 +38,7 @@ class KoFileDialog : public KFileDialog
   TQ_OBJECT
 public:
     KoFileDialog( const TQString& startDir, const TQString& filter,
-                  TQWidget *tqparent, const char *name,
+                  TQWidget *parent, const char *name,
                   bool modal );
     void setSpecialMimeFilter( TQStringList& mimeFilter,
                                const TQString& currentFormat, const int specialOutputFlag,
diff --git a/lib/kofficecore/KoFilter.h b/lib/kofficecore/KoFilter.h
index 0f087252a..77439648e 100644
--- a/lib/kofficecore/KoFilter.h
+++ b/lib/kofficecore/KoFilter.h
@@ -135,7 +135,7 @@ private:
  * @ref #endInternalEmbedding accordingly. Try to use the previous method if possible.
  *
  * If you're using this class you can also setup a signal/slot communication
- * between tqparent and child filter. To make that work you simply have to define
+ * between parent and child filter. To make that work you simply have to define
  * signals and slots along the following rules:
  * Signals should be named "commSignal\<name\>" where \<name\> is the name of the signal,
  * slots should be named "commSlot\<name\>". The connection will be done automatically
diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp
index e10e624be..471d60988 100644
--- a/lib/kofficecore/KoFilterChain.cpp
+++ b/lib/kofficecore/KoFilterChain.cpp
@@ -90,13 +90,13 @@ void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentF
     if ( !parentFilter )
         return;
 
-    const TQMetaObject* const tqparent = parentFilter->tqmetaObject();
+    const TQMetaObject* const parent = parentFilter->tqmetaObject();
     const TQMetaObject* const child = m_filter->tqmetaObject();
-    if ( !tqparent || !child )
+    if ( !parent || !child )
         return;
 
-    setupConnections( parentFilter, tqparent->signalNames(), m_filter, child->slotNames() );
-    setupConnections( m_filter, child->signalNames(), parentFilter, tqparent->slotNames() );
+    setupConnections( parentFilter, parent->signalNames(), m_filter, child->slotNames() );
+    setupConnections( m_filter, child->signalNames(), parentFilter, parent->slotNames() );
 }
 
 void KoFilterChain::ChainLink::setupConnections( const KoFilter* sender, const TQStrList& sigs,
@@ -406,7 +406,7 @@ void KoFilterChain::manageIO()
         if ( m_outputStorage ) {
             m_outputStorage->close();
             // Don't delete the storage if we're just pointing to the
-            // storage of the tqparent filter chain
+            // storage of the parent filter chain
             if ( !filterManagerParentChain() || m_outputStorage->mode() != KoStore::Write )
                 delete m_outputStorage;
             m_outputStorage = 0;
@@ -544,7 +544,7 @@ KoStoreDevice* KoFilterChain::storageInitEmbedding( const TQString& name )
     m_outputStorage = filterManagerParentChain()->m_outputStorage;
 
     if ( !m_outputStorage ) {
-        // If the storage of the tqparent hasn't been initialized yet,
+        // If the storage of the parent hasn't been initialized yet,
         // we have to do that here. Quite nasty...
         storageInit( filterManagerParentChain()->outputFile(), KoStore::Write, &m_outputStorage );
 
@@ -600,7 +600,7 @@ KoStoreDevice* KoFilterChain::storageCreateFirstStream( const TQString& streamNa
 
 KoStoreDevice* KoFilterChain::storageCleanupHelper( KoStore** storage )
 {
-    // Take care not to delete the storage of the tqparent chain
+    // Take care not to delete the storage of the parent chain
     if ( *storage != m_outputStorage || !filterManagerParentChain() ||
          ( *storage )->mode() != KoStore::Write )
         delete *storage;
diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h
index 7760a2176..d926c613f 100644
--- a/lib/kofficecore/KoFilterChain.h
+++ b/lib/kofficecore/KoFilterChain.h
@@ -123,7 +123,7 @@ public:
 private:
     // ### API for KOffice::Graph:
     // Construct a filter chain belonging to some KoFilterManager.
-    // The tqparent filter manager may be 0.
+    // The parent filter manager may be 0.
     KoFilterChain( const KoFilterManager* manager );
 
     void appendChainLink( KoFilterEntry::Ptr filterEntry, const TQCString& from, const TQCString& to );
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index 91522fbbd..31a1e43ea 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -48,8 +48,8 @@ public:
 };
 
 
-KoFilterChooser::KoFilterChooser (TQWidget *tqparent, const TQStringList &mimeTypes, const TQString &nativeFormat)
-    : KDialogBase (tqparent, "kofilterchooser", true, i18n ("Choose Filter"),
+KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeTypes, const TQString &nativeFormat)
+    : KDialogBase (parent, "kofilterchooser", true, i18n ("Choose Filter"),
                    KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true),
     m_mimeTypes (mimeTypes)
 {
diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h
index de75bf272..5f0641f4f 100644
--- a/lib/kofficecore/KoFilterManager.h
+++ b/lib/kofficecore/KoFilterManager.h
@@ -66,7 +66,7 @@ public:
      *        to specify this information only if the automatic detection will
      *        fail because e.g. you saved an embedded stream to a *.tmp file.
      *        Most likely you do not have to care about that.
-     * @param parentChain The tqparent filter chain of this filter manager. Used
+     * @param parentChain The parent filter chain of this filter manager. Used
      *        to allow embedding for filters. Most likely you do not have to care.
      */
     KoFilterManager( const TQString& url, const TQCString& mimetypeHint = "",
diff --git a/lib/kofficecore/KoFilterManager_p.h b/lib/kofficecore/KoFilterManager_p.h
index 358c25cd0..0e8a07628 100644
--- a/lib/kofficecore/KoFilterManager_p.h
+++ b/lib/kofficecore/KoFilterManager_p.h
@@ -33,7 +33,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    KoFilterChooser (TQWidget *tqparent, const TQStringList &mimeTypes,
+    KoFilterChooser (TQWidget *parent, const TQStringList &mimeTypes,
                      const TQString &nativeFormat = TQString());
     ~KoFilterChooser ();
 
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index f11ba9f0c..906e73f4e 100644
--- a/lib/kofficecore/KoFrame.cpp
+++ b/lib/kofficecore/KoFrame.cpp
@@ -48,8 +48,8 @@ public:
   KoFrame::State m_state;
 };
 
-KoFrame::KoFrame( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+KoFrame::KoFrame( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
 {
   d = new KoFramePrivate;
   d->m_state = Inactive;
diff --git a/lib/kofficecore/KoFrame.h b/lib/kofficecore/KoFrame.h
index fbb40bbbd..77b3d1c35 100644
--- a/lib/kofficecore/KoFrame.h
+++ b/lib/kofficecore/KoFrame.h
@@ -32,7 +32,7 @@ class KoFrame : public TQWidget
 public:
   enum State { Inactive, Selected, Active };
 
-  KoFrame( TQWidget *tqparent, const char *name = 0 );
+  KoFrame( TQWidget *parent, const char *name = 0 );
   virtual ~KoFrame();
 
   virtual void setView( KoView *view );
diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp
index 221288df7..5c8f680f3 100644
--- a/lib/kofficecore/KoGenStyles.cpp
+++ b/lib/kofficecore/KoGenStyles.cpp
@@ -33,24 +33,24 @@ TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int
 {
     StyleMap::iterator it = m_styleMap.find( style );
     if ( it == m_styleMap.end() ) {
-        // Not found, try if this style is in fact equal to its tqparent (the find above
+        // Not found, try if this style is in fact equal to its parent (the find above
         // wouldn't have found it, due to m_parentName being set).
         if ( !style.parentName().isEmpty() ) {
             KoGenStyle testStyle( style );
             const KoGenStyle* parentStyle = this->style( style.parentName() ); // ## linear search
             if( !parentStyle ) {
-                kdDebug(30003) << "KoGenStyles::lookup(" << name << "): tqparent style '" << style.parentName() << "' not found in collection" << endl;
+                kdDebug(30003) << "KoGenStyles::lookup(" << name << "): parent style '" << style.parentName() << "' not found in collection" << endl;
             } else {
                 if ( testStyle.m_familyName != parentStyle->m_familyName )
                 {
-                    kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") tqparent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl;
+                    kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") parent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl;
                 }
 
                 testStyle.m_parentName = parentStyle->m_parentName;
                 // Exclude the type from the comparison. It's ok for an auto style
-                // to have a user style as tqparent; they can still be identical
+                // to have a user style as parent; they can still be identical
                 testStyle.m_type = parentStyle->m_type;
-                // Also it's ok to not have the display name of the tqparent style
+                // Also it's ok to not have the display name of the parent style
                 // in the auto style
                 TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.find( "style:display-name" );
                 if ( it != parentStyle->m_attributes.end() )
@@ -211,13 +211,13 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
         if ( !m_parentName.isEmpty() ) {
             parentStyle = styles.style( m_parentName );
             if ( parentStyle && m_familyName.isEmpty() ) {
-                // get family from tqparent style, just in case
+                // get family from parent style, just in case
                 // Note: this is saving code, don't convert to attributeNS!
                 const_cast<KoGenStyle *>( this )->
                     m_familyName = parentStyle->attribute( "style:family" ).latin1();
-                //kdDebug(30003) << "Got familyname " << m_familyName << " from tqparent" << endl;
+                //kdDebug(30003) << "Got familyname " << m_familyName << " from parent" << endl;
             }
-            writer->addAttribute( "style:tqparent-style-name", m_parentName );
+            writer->addAttribute( "style:parent-style-name", m_parentName );
         }
     } else { // default-style
         Q_ASSERT( qstrcmp( elementName, "style:default-style" ) == 0 );
@@ -235,13 +235,13 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
     kdDebug() << "style: " << name << endl;
     printDebug();
     if ( parentStyle ) {
-        kdDebug() << " tqparent: " << m_parentName << endl;
+        kdDebug() << " parent: " << m_parentName << endl;
         parentStyle->printDebug();
     }
 #endif
 
-    // Write attributes [which differ from the tqparent style]
-    // We only look at the direct tqparent style because we assume
+    // Write attributes [which differ from the parent style]
+    // We only look at the direct parent style because we assume
     // that styles are fully specified, i.e. the inheritance is
     // only in the final file, not in the caller's code.
     TQMap<TQString, TQString>::const_iterator it = m_attributes.begin();
diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h
index 67f46da15..2a54f944a 100644
--- a/lib/kofficecore/KoGenStyles.h
+++ b/lib/kofficecore/KoGenStyles.h
@@ -216,7 +216,7 @@ public:
      * @param familyName The value for style:family, e.g. text, paragraph, graphic etc.
      * The family is for style:style elements only; number styles and list styles don't have one.
      *
-     * @param parentName If set, name of the tqparent style from which this one inherits.
+     * @param parentName If set, name of the parent style from which this one inherits.
      */
     explicit KoGenStyle( int type = 0, const char* familyName = 0,
                          const TQString& parentName = TQString() );
@@ -249,7 +249,7 @@ public:
     /// Return the family name
     const char* familyName() const { return m_familyName.data(); }
 
-    /// Return the name of style's tqparent, if set
+    /// Return the name of style's parent, if set
     TQString parentName() const { return m_parentName; }
 
     /**
@@ -379,7 +379,7 @@ public:
     /**
      * @return true if the style has no attributes, no properties, no style map etc.
      * This can be used by applications which do not save all attributes unconditionally,
-     * but only those that differ from the tqparent. But note that lookup() can't find this out...
+     * but only those that differ from the parent. But note that lookup() can't find this out...
      */
     bool isEmpty() const {
         if ( !m_attributes.isEmpty() || ! m_maps.isEmpty() )
@@ -393,7 +393,7 @@ public:
     /**
      *  Write the definition of this style to @p writer, using the OASIS format.
      *  @param writer the KoXmlWriter in which @p elementName will be created and filled in
-     *  @param styles the styles collection, used to look up the tqparent style
+     *  @param styles the styles collection, used to look up the parent style
      *  @param elementName the name of the XML element, e.g. "style:style". Don't forget to
      *  pass style:default-style if isDefaultStyle().
      *  @param name must come from the collection. It will be ignored if isDefaultStyle() is true.
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 4e30d64a1..5e4567de9 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -63,15 +63,15 @@
 class KoPartManager : public KParts::PartManager
 {
 public:
-  KoPartManager( TQWidget * tqparent, const char * name = 0L )
-    : KParts::PartManager( tqparent, name )
+  KoPartManager( TQWidget * parent, const char * name = 0L )
+    : KParts::PartManager( parent, name )
   {
       setSelectionPolicy( KParts::PartManager::TriState );
       setAllowNestedParts( true );
       setIgnoreScrollBars( true );
       // Allow right-click on embedded objects (without activating them)
-      // But beware: this means right-click on tqparent, from embedded object,
-      // doesn't make the tqparent active first...
+      // But beware: this means right-click on parent, from embedded object,
+      // doesn't make the parent active first...
       setActivationButtonMask( Qt::LeftButton | Qt::MidButton );
   }
   virtual bool eventFilter( TQObject *obj, TQEvent *ev )
diff --git a/lib/kofficecore/KoOasisLoadingContext.cpp b/lib/kofficecore/KoOasisLoadingContext.cpp
index 3db850e4a..3386daf88 100644
--- a/lib/kofficecore/KoOasisLoadingContext.cpp
+++ b/lib/kofficecore/KoOasisLoadingContext.cpp
@@ -68,9 +68,9 @@ void KoOasisLoadingContext::addStyles( const TQDomElement* style, const char* fa
 {
     Q_ASSERT( style );
     if ( !style ) return;
-    // this recursive function is necessary as tqparent styles can have parents themselves
-    if ( style->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) ) {
-        const TQString parentStyleName = style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
+    // this recursive function is necessary as parent styles can have parents themselves
+    if ( style->hasAttributeNS( KoXmlNS::style, "parent-style-name" ) ) {
+        const TQString parentStyleName = style->attributeNS( KoXmlNS::style, "parent-style-name", TQString() );
         const TQDomElement* parentStyle = 0;
         if ( usingStylesAutoStyles ) {
             // When loading something from styles.xml, look into the styles.xml auto styles first
diff --git a/lib/kofficecore/KoOasisLoadingContext.h b/lib/kofficecore/KoOasisLoadingContext.h
index 880d4117a..c36a0fb1e 100644
--- a/lib/kofficecore/KoOasisLoadingContext.h
+++ b/lib/kofficecore/KoOasisLoadingContext.h
@@ -68,7 +68,7 @@ public:
      *
      * Read attribute (nsURI,attrName) from the given dom element,
      * treat that attribute as a style name, and load that style
-     * including all its tqparent styles.
+     * including all its parent styles.
      * @param element the dom element to read the attribute from
      * @param nsURI the namespace URI of the attribute to read
      * @param attrName the name of the attribute to read
@@ -77,12 +77,12 @@ public:
     void fillStyleStack( const TQDomElement& element, const char* nsURI, const char* attrName, const char* family );
 
     /**
-     * Add @p style to the stack, as well as all its tqparent styles
+     * Add @p style to the stack, as well as all its parent styles
      * and the default style for this style family.
      *
      * @param style the dom element containing the style to add to the stack
-     * @param family the family to use when looking up tqparent styles
-     * @param usingStylesAutoStyles if true, the tqparent styles are looked up
+     * @param family the family to use when looking up parent styles
+     * @param usingStylesAutoStyles if true, the parent styles are looked up
      *   in the automatic styles from styles.xml, instead of looking up
      *   in the automatic styles from content.xml as we usually do.
      *   This is useful for loading headers and footers for instance.
diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp
index fe4ee658e..fe88a11b2 100644
--- a/lib/kofficecore/KoOasisStyles.cpp
+++ b/lib/kofficecore/KoOasisStyles.cpp
@@ -224,11 +224,11 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles )
 // OO spec 2.5.4. p68. Conversion to TQt format: see qdate.html
 // OpenCalcImport::loadFormat has similar code, but slower, intermixed with other stuff,
 // lacking long-textual forms.
-void KoOasisStyles::importDataStyle( const TQDomElement& tqparent )
+void KoOasisStyles::importDataStyle( const TQDomElement& parent )
 {
     NumericStyleFormat dataStyle;
 
-    const TQString localName = tqparent.localName();
+    const TQString localName = parent.localName();
     if (localName == "number-style")
       dataStyle.type = NumericStyleFormat::Number;
     else if (localName == "currency-style")
@@ -255,7 +255,7 @@ void KoOasisStyles::importDataStyle( const TQDomElement& tqparent )
     TQDomElement e;
     TQString prefix;
     TQString suffix;
-    forEachElement( e, tqparent )
+    forEachElement( e, parent )
     {
         if ( e.namespaceURI() != KoXmlNS::number )
             continue;
@@ -446,7 +446,7 @@ void KoOasisStyles::importDataStyle( const TQDomElement& tqparent )
 
     }
 
-    const TQString styleName = tqparent.attributeNS( KoXmlNS::style, "name", TQString() );
+    const TQString styleName = parent.attributeNS( KoXmlNS::style, "name", TQString() );
     kdDebug(30003) << "data style: " << styleName << " qt format=" << format << endl;
     if ( !prefix.isEmpty() )
     {
diff --git a/lib/kofficecore/KoOasisStyles.h b/lib/kofficecore/KoOasisStyles.h
index 9a8e64e44..dfa9e468c 100644
--- a/lib/kofficecore/KoOasisStyles.h
+++ b/lib/kofficecore/KoOasisStyles.h
@@ -137,7 +137,7 @@ private:
 private:
     void insertOfficeStyles( const TQDomElement& styles );
     void insertStyle( const TQDomElement& style, bool styleAutoStyles );
-    void importDataStyle( const TQDomElement& tqparent );
+    void importDataStyle( const TQDomElement& parent );
     static bool saveOasisTimeFormat( KoXmlWriter &elementWriter, TQString & format, TQString & text, bool &antislash );
     static void parseOasisDateKlocale(KoXmlWriter &elementWriter, TQString & format, TQString & text );
     static bool saveOasisKlocaleTimeFormat( KoXmlWriter &elementWriter, TQString & format, TQString & text );
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 6c7cbb86e..83978239f 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -94,8 +94,8 @@ class KoOpenPanePrivate
     KInstance* m_instance;
 };
 
-KoOpenPane::KoOpenPane(TQWidget *tqparent, KInstance* instance, const TQString& templateType)
-  : KoOpenPaneBase(tqparent, "OpenPane")
+KoOpenPane::KoOpenPane(TQWidget *parent, KInstance* instance, const TQString& templateType)
+  : KoOpenPaneBase(parent, "OpenPane")
 {
   d = new KoOpenPanePrivate;
   d->m_instance = instance;
diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h
index 818c6e818..64f799d82 100644
--- a/lib/kofficecore/KoOpenPane.h
+++ b/lib/kofficecore/KoOpenPane.h
@@ -39,11 +39,11 @@ class KoOpenPane : public KoOpenPaneBase
   public:
     /**
      * Constructor
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param instance the KInstance to be used for KConfig data
      * @param templateType the template-type (group) that should be selected on creation.
      */
-    KoOpenPane(TQWidget *tqparent, KInstance* instance, const TQString& templateType = TQString());
+    KoOpenPane(TQWidget *parent, KInstance* instance, const TQString& templateType = TQString());
     virtual ~KoOpenPane();
 
     TQListViewItem* addPane(const TQString& title, const TQString& icon, TQWidget* widget, int sortWeight);
diff --git a/lib/kofficecore/KoPicture.h b/lib/kofficecore/KoPicture.h
index 3fa355f8a..63dd9c596 100644
--- a/lib/kofficecore/KoPicture.h
+++ b/lib/kofficecore/KoPicture.h
@@ -179,8 +179,8 @@ public:
      * Download and set the key for a possibly remote file.
      *
      * @param url the url to download from
-     * @param window the tqparent widget for the download. You can pass
-     *               NULL (0) if you absolutely cannot find a tqparent
+     * @param window the parent widget for the download. You can pass
+     *               NULL (0) if you absolutely cannot find a parent
      *               widget to use.
      */
     bool setKeyAndDownloadPicture(const KURL& url, TQWidget *window);
@@ -204,7 +204,7 @@ public:
     void setAlphaBuffer(bool enable);
 
     /**
-     * Creates an alpha tqmask for the picture
+     * Creates an alpha mask for the picture
      * (first you have to call @ref #setAlphaBuffer).
      *
      * @see hasAlphaBuffer() setAlphaBuffer()
diff --git a/lib/kofficecore/KoPictureCollection.h b/lib/kofficecore/KoPictureCollection.h
index 8071d564e..8d96761c3 100644
--- a/lib/kofficecore/KoPictureCollection.h
+++ b/lib/kofficecore/KoPictureCollection.h
@@ -71,7 +71,7 @@ public:
      * If this file is really remote, it is always downloaded.
      * If the file is local, it acts as @ref #loadPicture.
      * @param url the URL to download from
-     * @param window the tqparent window for the download. You can pass NULL (0)
+     * @param window the parent window for the download. You can pass NULL (0)
      *               if you absolutely cannot find anything to use.
      */
     KoPicture downloadPicture(const KURL& url, TQWidget *window);
diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp
index e164aa1af..0003d00d1 100644
--- a/lib/kofficecore/KoQueryTrader.cpp
+++ b/lib/kofficecore/KoQueryTrader.cpp
@@ -48,7 +48,7 @@ KoDocumentEntry::KoDocumentEntry( KService::Ptr service )
 {
 }
 
-KoDocument* KoDocumentEntry::createDoc( KoDocument* tqparent, const char* name ) const
+KoDocument* KoDocumentEntry::createDoc( KoDocument* parent, const char* name ) const
 {
     KLibFactory* factory = KLibLoader::self()->factory( TQFile::encodeName(m_service->library()) );
 
@@ -59,10 +59,10 @@ KoDocument* KoDocumentEntry::createDoc( KoDocument* tqparent, const char* name )
 
     TQObject* obj;
     if ( factory->inherits( "KParts::Factory" ) )
-      obj = static_cast<KParts::Factory *>(factory)->createPart( 0L, "", tqparent, name, "KoDocument" );
+      obj = static_cast<KParts::Factory *>(factory)->createPart( 0L, "", parent, name, "KoDocument" );
     else {
       kdWarning(30003) << "factory doesn't inherit KParts::Factory ! It is a " << factory->className() << endl; // This shouldn't happen...
-      obj = factory->create( tqparent, name, "KoDocument" );
+      obj = factory->create( parent, name, "KoDocument" );
     }
 
     if ( !obj || !obj->inherits( "KoDocument" ) )
@@ -192,7 +192,7 @@ TQValueList<KoFilterEntry::Ptr> KoFilterEntry::query( const TQString & _constr )
   return lst;
 }
 
-KoFilter* KoFilterEntry::createFilter( KoFilterChain* chain, TQObject* tqparent, const char* name )
+KoFilter* KoFilterEntry::createFilter( KoFilterChain* chain, TQObject* parent, const char* name )
 {
     KLibFactory* factory = KLibLoader::self()->factory( TQFile::encodeName( m_service->library() ) );
 
@@ -201,7 +201,7 @@ KoFilter* KoFilterEntry::createFilter( KoFilterChain* chain, TQObject* tqparent,
         return 0;
     }
 
-    TQObject* obj = factory->create( tqparent, name, "KoFilter" );
+    TQObject* obj = factory->create( parent, name, "KoFilter" );
     if ( !obj || !obj->inherits( "KoFilter" ) )
     {
         delete obj;
diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h
index 54fa811e0..c945d5a68 100644
--- a/lib/kofficecore/KoQueryTrader.h
+++ b/lib/kofficecore/KoQueryTrader.h
@@ -70,7 +70,7 @@ public:
    *  Uses the factory of the component to create
    *  a document. If that is not possible, 0 is returned.
    */
-  KoDocument* createDoc( KoDocument* tqparent = 0, const char* name = 0 ) const;
+  KoDocument* createDoc( KoDocument* parent = 0, const char* name = 0 ) const;
 
   /**
    *  This function will query ksycoca to find all available components.
@@ -126,7 +126,7 @@ public:
   KoFilterEntry( KService::Ptr service );
   ~KoFilterEntry() { }
 
-  KoFilter* createFilter( KoFilterChain* chain, TQObject* tqparent = 0, const char* name = 0 );
+  KoFilter* createFilter( KoFilterChain* chain, TQObject* parent = 0, const char* name = 0 );
 
   /**
    *  The imported mimetype(s).
diff --git a/lib/kofficecore/KoStyleStack.cpp b/lib/kofficecore/KoStyleStack.cpp
index 9920c2893..1f64c4d63 100644
--- a/lib/kofficecore/KoStyleStack.cpp
+++ b/lib/kofficecore/KoStyleStack.cpp
@@ -171,7 +171,7 @@ bool KoStyleStack::hasAttributeNS( const char* nsURI, const char* name, const ch
     return false;
 }
 
-// Font size is a bit special. "115%" applies to "the fontsize of the tqparent style".
+// Font size is a bit special. "115%" applies to "the fontsize of the parent style".
 // This can be generalized though (hasAttributeThatCanBePercentOfParent() ? :)
 // Although, if we also add support for fo:font-size-rel here then it's not general anymore.
 double KoStyleStack::fontSize() const
@@ -258,9 +258,9 @@ bool KoStyleStack::isUserStyle( const TQDomElement& e, const TQString& family )
 {
     if ( e.attributeNS( m_styleNSURI, "family", TQString() ) != family )
         return false;
-    const TQDomElement tqparent = e.parentNode().toElement();
-    //kdDebug(30003) << k_funcinfo << "tagName=" << e.tagName() << " tqparent-tagName=" << tqparent.tagName() << endl;
-    return tqparent.localName() == "styles" /*&& tqparent.namespaceURI() == KoXmlNS::office*/;
+    const TQDomElement parent = e.parentNode().toElement();
+    //kdDebug(30003) << k_funcinfo << "tagName=" << e.tagName() << " parent-tagName=" << parent.tagName() << endl;
+    return parent.localName() == "styles" /*&& parent.namespaceURI() == KoXmlNS::office*/;
 }
 
 TQString KoStyleStack::userStyleName( const TQString& family ) const
diff --git a/lib/kofficecore/KoStyleStack.h b/lib/kofficecore/KoStyleStack.h
index 4fbc17937..6c188989d 100644
--- a/lib/kofficecore/KoStyleStack.h
+++ b/lib/kofficecore/KoStyleStack.h
@@ -36,7 +36,7 @@
  *  There can be several styles that are valid for one object. For example
  *  a textobject on a page has styles 'pr3' and 'P7' and a paragraph in
  *  that textobject has styles 'P1' and 'T3'. And some styles even have
- *  tqparent-styles...
+ *  parent-styles...
  *
  *  If you want to know if there is, for example,  the attribute 'fo:font-family'
  *  for this paragraph, you have to look into style 'T3', 'P1', 'P7' and 'pr3'.
@@ -54,7 +54,7 @@
  *
  *  In general though, you wouldn't use push/pop directly, but KoOasisLoadingContext::fillStyleStack
  *  or KoOasisLoadingContext::addStyles to automatically push a style and all its
- *  tqparent styles onto the stack.
+ *  parent styles onto the stack.
  */
 class KOFFICECORE_EXPORT  KoStyleStack
 {
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index e2b9775e4..debb9f7c0 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -106,8 +106,8 @@ public:
   bool m_inOperation; //in the middle of an operation (no screen refreshing)?
 };
 
-KoView::KoView( KoDocument *document, TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+KoView::KoView( KoDocument *document, TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
 {
   Q_ASSERT( document );
 
@@ -538,7 +538,7 @@ void KoView::slotChildActivated( bool a )
     if ( n == (TQObject *)view )
       return;
     else
-     n = n->tqparent();
+     n = n->parent();
 
 
   d->m_tempActiveWidget = activeWidget;
diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h
index 42d78fb6e..93eb8971e 100644
--- a/lib/kofficecore/KoView.h
+++ b/lib/kofficecore/KoView.h
@@ -68,12 +68,12 @@ public:
    *
    * @param document is the document which should be displayed in this view. This pointer
    *                 must not be zero.
-   * @param tqparent   tqparent widget for this view.
+   * @param parent   parent widget for this view.
    * @param name     Name of the view. The name is used in DCOP, so the name should
    *                 match the pattern [A-Za-z_][A-Za-z_0-9]*.
    *
    */
-  KoView( KoDocument *document, TQWidget *tqparent = 0, const char *name = 0 );
+  KoView( KoDocument *document, TQWidget *parent = 0, const char *name = 0 );
   /**
    * Destroys the view and unregisters at the document.
    */
diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp
index 52e6d8ae4..3b2d3efb4 100644
--- a/lib/kofficecore/KoXmlReader.cpp
+++ b/lib/kofficecore/KoXmlReader.cpp
@@ -173,7 +173,7 @@ public:
   TQString nodeName() const;
 
   // for tree and linked-list
-  KoXmlNodeData* tqparent;
+  KoXmlNodeData* parent;
   KoXmlNodeData* prev;
   KoXmlNodeData* next;
   KoXmlNodeData* first;
@@ -295,7 +295,7 @@ KoXmlNodeData::KoXmlNodeData()
   textData = TQString();
 
   count = 1;
-  tqparent = 0;
+  parent = 0;
   prev = next = 0;
   first = last = 0;
 
@@ -333,7 +333,7 @@ void KoXmlNodeData::clear()
   attr.clear();
   attrNS.clear();
 
-  tqparent = 0;
+  parent = 0;
   prev = next = 0;
   first = last = 0;
 
@@ -389,15 +389,15 @@ KoXmlNodeData* KoXmlNodeData::ownerDocument()
 {
   KoXmlNodeData* owner = this;
 
-  while( owner->tqparent ) 
-    owner = owner->tqparent;
+  while( owner->parent ) 
+    owner = owner->parent;
 
   return (owner->nodeType==KoXmlNode::DocumentNode) ? owner : 0;
 }
 
 void KoXmlNodeData::appendChild( KoXmlNodeData* node )
 {
-  node->tqparent = this;
+  node->parent = this;
   if( !last )
     first = last = node;
   else
@@ -678,7 +678,7 @@ const TQString& name, const TQXmlAttributes& atts )
       // construct a new element
       element = new KoXmlNodeData;
       element->nodeType = KoXmlNode::ElementNode;
-      element->tqparent = currentNode;
+      element->parent = currentNode;
       element->namespaceURI = nsURI;
       element->prefix = nodePrefix;
       element->localName = nodeLocalName;
@@ -744,7 +744,7 @@ const TQString& name, const TQXmlAttributes& atts )
       // construct a new element
       element = new KoXmlNodeData;
       element->nodeType = KoXmlNode::ElementNode;
-      element->tqparent = currentNode;
+      element->parent = currentNode;
       element->namespaceURI = TQString();
       element->prefix = TQString();
       element->localName = TQString();
@@ -810,7 +810,7 @@ const TQString& qName )
   
   // sanity check
   if( !currentNode ) return false;
-  if( !currentNode->tqparent ) return false;
+  if( !currentNode->parent ) return false;
 
   // see comments in startElement about first element and on-demand loading
   if( rootNode->nodeType == KoXmlNode::DocumentNode )
@@ -826,7 +826,7 @@ const TQString& qName )
 
   // go up one level
   if( elementDepth <= maxDepth )
-    currentNode = currentNode->tqparent;
+    currentNode = currentNode->parent;
 
   // we are going up one level
   elementDepth--;
@@ -856,7 +856,7 @@ bool KoXmlHandler::characters( const TQString& str )
     {
       KoXmlNodeData* cdata = new KoXmlNodeData;
       cdata->nodeType = KoXmlNode::CDATASectionNode;
-      cdata->tqparent = currentNode;
+      cdata->parent = currentNode;
       cdata->setData( str );
       currentNode->appendChild( cdata );
     }
@@ -871,7 +871,7 @@ bool KoXmlHandler::characters( const TQString& str )
     {
       KoXmlNodeData* text = new KoXmlNodeData;
       text->nodeType = KoXmlNode::TextNode;
-      text->tqparent = currentNode;
+      text->parent = currentNode;
       text->setData( str );
       currentNode->appendChild( text );
     }
@@ -893,7 +893,7 @@ const TQString& data )
   
   KoXmlNodeData* instruction = new KoXmlNodeData;
   instruction->nodeType = KoXmlNode::ProcessingInstructionNode;
-  instruction->tqparent = currentNode;
+  instruction->parent = currentNode;
   instruction->tagName = target;
   instruction->setData( data );
 
@@ -1101,7 +1101,7 @@ TQString KoXmlNode::localName() const
 KoXmlDocument KoXmlNode::ownerDocument() const
 {
   KoXmlNodeData* node = d; 
-  while( node->tqparent ) node = node->tqparent;
+  while( node->parent ) node = node->parent;
 
   if( node->nodeType != DocumentNode ) return KoXmlDocument();  
   return KoXmlDocument( node );
@@ -1109,7 +1109,7 @@ KoXmlDocument KoXmlNode::ownerDocument() const
 
 KoXmlNode KoXmlNode::parentNode() const
 {
-  return d->tqparent ? KoXmlNode( d->tqparent ) : KoXmlNode();
+  return d->parent ? KoXmlNode( d->parent ) : KoXmlNode();
 }
 
 bool KoXmlNode::hasChildNodes() const
diff --git a/lib/kofficecore/KoXmlReader.h b/lib/kofficecore/KoXmlReader.h
index d45053981..cdce29385 100644
--- a/lib/kofficecore/KoXmlReader.h
+++ b/lib/kofficecore/KoXmlReader.h
@@ -54,7 +54,7 @@ class KoXmlNodeData;
  * KoXmlNode is a base class for KoXmlElement, KoXmlText.
  * Often, these subclasses are used for getting the data instead of KoXmlNode.
  * However, as base class, KoXmlNode is very helpful when for example iterating 
- * all child nodes within one tqparent node.
+ * all child nodes within one parent node.
  *
  * KoXmlNode implements an explicit sharing, a node shares its data with 
  * other copies (if exist).
@@ -267,7 +267,7 @@ private:
  *
  * To find all child elements with a given name, use
  * TQDomElement e;
- * forEachElement( e, tqparent )
+ * forEachElement( e, parent )
  * {
  *     if ( e.localName() == "..." && e.namespaceURI() == KoXmlNS::... )
  *     {
@@ -312,8 +312,8 @@ namespace KoXml {
 
 }
 
-#define forEachElement( elem, tqparent ) \
-      for ( KoXmlNode _node = tqparent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \
+#define forEachElement( elem, parent ) \
+      for ( KoXmlNode _node = parent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \
         if ( !( elem = _node.toElement() ).isNull() )
 
 
diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp
index a9fc21824..188d58889 100644
--- a/lib/kofficecore/Koversiondialog.cpp
+++ b/lib/kofficecore/Koversiondialog.cpp
@@ -38,8 +38,8 @@
 #include "Koversiondialog.h"
 
 
-KoVersionDialog::KoVersionDialog( TQWidget* tqparent,  const char* name )
-    : KDialogBase( tqparent, name, true, i18n("Version"), Ok|Cancel )
+KoVersionDialog::KoVersionDialog( TQWidget* parent,  const char* name )
+    : KDialogBase( parent, name, true, i18n("Version"), Ok|Cancel )
 {
   TQWidget* page = new TQWidget( this );
   setMainWidget( page );
@@ -121,8 +121,8 @@ void KoVersionDialog::slotOk()
     accept();
 }
 
-KoVersionModifyDialog::KoVersionModifyDialog(  TQWidget* tqparent, const TQString &/*comment*/, const char* name )
-    : KDialogBase( tqparent, name, true, i18n("Comment"), Ok|Cancel )
+KoVersionModifyDialog::KoVersionModifyDialog(  TQWidget* parent, const TQString &/*comment*/, const char* name )
+    : KDialogBase( parent, name, true, i18n("Comment"), Ok|Cancel )
 {
     TQWidget* page = new TQWidget( this );
     setMainWidget( page );
diff --git a/lib/kofficecore/Koversiondialog.h b/lib/kofficecore/Koversiondialog.h
index e357e964b..547e518aa 100644
--- a/lib/kofficecore/Koversiondialog.h
+++ b/lib/kofficecore/Koversiondialog.h
@@ -32,7 +32,7 @@ class KoVersionDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoVersionDialog(  TQWidget* tqparent, const char* name = 0L );
+    KoVersionDialog(  TQWidget* parent, const char* name = 0L );
     ~KoVersionDialog();
 
 public slots:
@@ -59,7 +59,7 @@ class KoVersionModifyDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoVersionModifyDialog(  TQWidget* tqparent, const TQString &_comment = TQString() , const char* name = 0L );
+    KoVersionModifyDialog(  TQWidget* parent, const TQString &_comment = TQString() , const char* name = 0L );
 
     TQString comment() const;
 
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index dccc913a3..9535c14ac 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -157,18 +157,18 @@ class KKbdAccessExtensionsPrivate
         KMainWindow* mainWindow;
 };
 
-KKbdAccessExtensions::KKbdAccessExtensions(KMainWindow* tqparent, const char* name) :
-    TQObject(tqparent, name)
+KKbdAccessExtensions::KKbdAccessExtensions(KMainWindow* parent, const char* name) :
+    TQObject(parent, name)
 {
     // kdDebug() << "KKbdAccessExtensions::KKbdAccessExtensions: running." << endl;
     d = new KKbdAccessExtensionsPrivate;
-    d->mainWindow = tqparent;
+    d->mainWindow = parent;
     d->fwdAction = new KAction(i18n("Resize Panel Forward"), KShortcut("F8"),
-        0, 0, tqparent->actionCollection(), "resize_panel_forward");
+        0, 0, parent->actionCollection(), "resize_panel_forward");
     d->revAction = new KAction(i18n("Resize Panel Reverse"), KShortcut("Shift+F8"),
-        0, 0, tqparent->actionCollection(), "resize_panel_reverse");
+        0, 0, parent->actionCollection(), "resize_panel_reverse");
     d->accessKeysAction = new KAction(i18n("Access Keys"), KShortcut("Alt+F8"),
-        0, 0, tqparent->actionCollection(), "access_keys");
+        0, 0, parent->actionCollection(), "access_keys");
     // "Disable" the shortcuts so we can see them in eventFilter.
     d->fwdAction->setEnabled(false);
     d->revAction->setEnabled(false);
diff --git a/lib/kofficecore/kkbdaccessextensions.h b/lib/kofficecore/kkbdaccessextensions.h
index bc68cb284..e520b1ec3 100644
--- a/lib/kofficecore/kkbdaccessextensions.h
+++ b/lib/kofficecore/kkbdaccessextensions.h
@@ -114,10 +114,10 @@ class KOFFICECORE_EXPORT KKbdAccessExtensions : public TQObject
 
     public:
         /** Constructor.
-        *   @param tqparent       KMainWindow of the application.  Required.
+        *   @param parent       KMainWindow of the application.  Required.
         *   @param name         (optional) Name of this object.
         */
-        KKbdAccessExtensions(KMainWindow* tqparent, const char* name = 0);
+        KKbdAccessExtensions(KMainWindow* parent, const char* name = 0);
 
         /** Destructor. */
         virtual ~KKbdAccessExtensions();
diff --git a/lib/kofficecore/priorityqueue.h b/lib/kofficecore/priorityqueue.h
index a9a5c770f..b657ab737 100644
--- a/lib/kofficecore/priorityqueue.h
+++ b/lib/kofficecore/priorityqueue.h
@@ -86,7 +86,7 @@ namespace KOffice {
 
     private:
         // Note: We have to use a 1-based index here, and we get/return 0-based ones
-        int tqparent( int i ) { return ( ( i + 1 ) >> 1 ) - 1; }
+        int parent( int i ) { return ( ( i + 1 ) >> 1 ) - 1; }
         int left( int i ) { return ( ( i + 1 ) << 1 ) - 1; }
         int right( int i ) { return ( i + 1 ) << 1; }
 
@@ -190,14 +190,14 @@ namespace KOffice {
     template<class T>
     void PriorityQueue<T>::bubbleUp( T* item, int i )
     {
-        int p = tqparent( i );
+        int p = parent( i );
         while ( i > 0 && m_vector[ p ]->key() > item->key() ) {
             // update the index first
             m_vector[ p ]->setIndex( i );
             // then move it there
             m_vector[ i ] = m_vector[ p ];
             i = p;
-            p = tqparent( i );
+            p = parent( i );
         }
         item->setIndex( i );
         m_vector[ i ] = item;
diff --git a/lib/kofficecore/tests/kogenstylestest.cpp b/lib/kofficecore/tests/kogenstylestest.cpp
index ef9150f6c..165d0ce9e 100644
--- a/lib/kofficecore/tests/kogenstylestest.cpp
+++ b/lib/kofficecore/tests/kogenstylestest.cpp
@@ -66,8 +66,8 @@ int testLookup()
 
     KoGenStyle third( KoGenStyle::STYLE_AUTO, "paragraph", secondName ); // inherited style
     third.addProperty( "style:margin-left", "1.249cm" );
-    third.addProperty( "style:page-number", "0" ); // same as tqparent
-    third.addProperty( "style:foobar", "3", KoGenStyle::TextType ); // different from tqparent
+    third.addProperty( "style:page-number", "0" ); // same as parent
+    third.addProperty( "style:foobar", "3", KoGenStyle::TextType ); // different from parent
     assert( third.parentName() == secondName );
 
     TQString thirdName = coll.lookup( third, "P" );
@@ -88,7 +88,7 @@ int testLookup()
     sameAsParent.addStyleMap( map1 );
     sameAsParent.addStyleMap( map2 );
     TQString sapName = coll.lookup( sameAsParent, "foobar" );
-    kdDebug() << "The 'same as tqparent' style got assigned the name " << sapName << endl;
+    kdDebug() << "The 'same as parent' style got assigned the name " << sapName << endl;
 
     assert( sapName == secondName );
     assert( coll.styles().count() == 3 );
@@ -119,7 +119,7 @@ int testLookup()
 
     TEST_BEGIN( 0, 0 );
     third.writeStyle( &writer, coll, "style:style", thirdName, "style:paragraph-properties" );
-    TEST_END( "XML for third style", "<r>\n <style:style style:name=\"P1\" style:tqparent-style-name=\"A1\" style:family=\"paragraph\">\n  <style:paragraph-properties style:margin-left=\"1.249cm\"/>\n  <style:text-properties style:foobar=\"3\"/>\n </style:style>\n</r>\n" );
+    TEST_END( "XML for third style", "<r>\n <style:style style:name=\"P1\" style:parent-style-name=\"A1\" style:family=\"paragraph\">\n  <style:paragraph-properties style:margin-left=\"1.249cm\"/>\n  <style:text-properties style:foobar=\"3\"/>\n </style:style>\n</r>\n" );
 
     coll.markStyleForStylesXml( firstName );
     {
@@ -166,11 +166,11 @@ int testDefaultStyle()
 
     // The kspread case: not writing out all properties, only if they differ
     // from the default style.
-    // KoGenStyles doesn't fetch info from the tqparent style when testing
-    // for equality, so KSpread uses isEmpty() to check for equality-to-tqparent.
+    // KoGenStyles doesn't fetch info from the parent style when testing
+    // for equality, so KSpread uses isEmpty() to check for equality-to-parent.
     KoGenStyle dataStyle( KoGenStyle::STYLE_AUTO, "paragraph", defaultStyleName );
     assert( dataStyle.isEmpty() );
-    // and then it doesn't look up the auto style, but rather uses the tqparent style directly.
+    // and then it doesn't look up the auto style, but rather uses the parent style directly.
 
     return 0;
 }
@@ -201,13 +201,13 @@ int testUserStyles()
 
     // And now, what if the data uses that style?
     // This is like sameAsParent in the other test, but this time the
-    // tqparent is a STYLE_USER...
+    // parent is a STYLE_USER...
     KoGenStyle dataStyle( KoGenStyle::STYLE_AUTO, "paragraph", user2StyleName );
     dataStyle.addProperty( "myfont", "isBold" );
 
     TQString dataStyleName = coll.lookup( dataStyle, "DataStyle" );
     kdDebug() << "The auto style got assigned the name " << dataStyleName << endl;
-    assert( dataStyleName == "User2" ); // it found the tqparent as equal
+    assert( dataStyleName == "User2" ); // it found the parent as equal
 
     // Let's do the opposite test, just to make sure
     KoGenStyle dataStyle2( KoGenStyle::STYLE_AUTO, "paragraph", user2StyleName );
diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp
index a7f09b3f4..c8b104a95 100644
--- a/lib/kofficeui/KoCharSelectDia.cpp
+++ b/lib/kofficeui/KoCharSelectDia.cpp
@@ -29,8 +29,8 @@
 /* class KoCharSelectDia                                           */
 /******************************************************************/
 
-KoCharSelectDia::KoCharSelectDia( TQWidget *tqparent, const char *name, const TQChar &_chr, const TQString &_font, bool _enableFont , bool _modal)
-    : KDialogBase( Plain, i18n("Select Character"), Ok | Cancel, Ok , tqparent, name, _modal )
+KoCharSelectDia::KoCharSelectDia( TQWidget *parent, const char *name, const TQChar &_chr, const TQString &_font, bool _enableFont , bool _modal)
+    : KDialogBase( Plain, i18n("Select Character"), Ok | Cancel, Ok , parent, name, _modal )
 {
     initDialog(_chr,_font,_enableFont);
 
@@ -40,8 +40,8 @@ KoCharSelectDia::KoCharSelectDia( TQWidget *tqparent, const char *name, const TQ
     setButtonOK( okItem );
 }
 
-KoCharSelectDia::KoCharSelectDia( TQWidget *tqparent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal )
-    : KDialogBase( Plain, i18n("Select Character"), User1 | Close, User1 , tqparent, name, _modal )
+KoCharSelectDia::KoCharSelectDia( TQWidget *parent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal )
+    : KDialogBase( Plain, i18n("Select Character"), User1 | Close, User1 , parent, name, _modal )
 {
     initDialog(_chr,_font,true);
 
@@ -77,11 +77,11 @@ void KoCharSelectDia::closeDialog()
     KDialogBase::close();
 }
 
-bool KoCharSelectDia::selectChar( TQString &_font, TQChar &_chr, bool _enableFont, TQWidget* tqparent, const char* name )
+bool KoCharSelectDia::selectChar( TQString &_font, TQChar &_chr, bool _enableFont, TQWidget* parent, const char* name )
 {
     bool res = false;
 
-    KoCharSelectDia *dlg = new KoCharSelectDia( tqparent, name, _chr, _font, _enableFont );
+    KoCharSelectDia *dlg = new KoCharSelectDia( parent, name, _chr, _font, _enableFont );
     dlg->setFocus();
     if ( dlg->exec() == Accepted )
     {
diff --git a/lib/kofficeui/KoCharSelectDia.h b/lib/kofficeui/KoCharSelectDia.h
index 507c0704f..b281cd122 100644
--- a/lib/kofficeui/KoCharSelectDia.h
+++ b/lib/kofficeui/KoCharSelectDia.h
@@ -41,15 +41,15 @@ class KOFFICEUI_EXPORT KoCharSelectDia : public KDialogBase
 public:
 
     // constructor - destructor
-    KoCharSelectDia( TQWidget *tqparent, const char *name, const TQChar &_chr,
+    KoCharSelectDia( TQWidget *parent, const char *name, const TQChar &_chr,
                      const TQString &_font, bool _enableFont, bool _modal=true );
 
     //constructor when you want to insert multi char
-    KoCharSelectDia( TQWidget *tqparent, const char *name, const TQString &_font,
+    KoCharSelectDia( TQWidget *parent, const char *name, const TQString &_font,
                      const TQChar &_chr, bool _modal=true );
     ~KoCharSelectDia();
     // select char dialog
-    KOFFICEUI_EXPORT static bool selectChar( TQString &_font, TQChar &_chr, bool _enableFont = true, TQWidget* tqparent = 0, const char* name = 0);
+    KOFFICEUI_EXPORT static bool selectChar( TQString &_font, TQChar &_chr, bool _enableFont = true, TQWidget* parent = 0, const char* name = 0);
 
     // internal
     TQChar chr() const;
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index cfde28025..27c51e792 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -33,8 +33,8 @@
 
 #include "KoCommandHistory.h"
 
-KoListBox::KoListBox( TQWidget *tqparent , const char *name , WFlags f)
-    : TQListBox( tqparent, name, f)
+KoListBox::KoListBox( TQWidget *parent , const char *name , WFlags f)
+    : TQListBox( parent, name, f)
 {
     setVScrollBarMode( AlwaysOn );
 }
diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h
index 34fd1b50d..8522da3b9 100644
--- a/lib/kofficeui/KoCommandHistory.h
+++ b/lib/kofficeui/KoCommandHistory.h
@@ -36,7 +36,7 @@ class KoListBox : public TQListBox {
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoListBox( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 );
+    KoListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
 protected:
     virtual void contentsMouseMoveEvent ( TQMouseEvent * );
     virtual TQSize tqsizeHint() const;
diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index c2a237bdb..82f786e87 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -34,8 +34,8 @@
 #include <kapplication.h>
 #include <tqstring.h>
 
-KoVerticalLabel::KoVerticalLabel( TQWidget* tqparent, const char* name )
-		: TQWidget( tqparent, name, TQt::WRepaintNoErase )
+KoVerticalLabel::KoVerticalLabel( TQWidget* parent, const char* name )
+		: TQWidget( parent, name, TQt::WRepaintNoErase )
 {
 	TQFont f( font() );
 	f.setPointSize( f.pointSize() + 2 );
@@ -74,8 +74,8 @@ void KoVerticalLabel::paintEvent( TQPaintEvent* )
 static unsigned char upbits[]   = { 0xc, 0x1e, 0x3f, 0x3f };
 static unsigned char downbits[] = { 0x3f, 0x3f, 0x1e, 0xc };
 
-KoHelpNavButton::KoHelpNavButton( NavDirection d, TQWidget* tqparent )
-		: TQWidget( tqparent )
+KoHelpNavButton::KoHelpNavButton( NavDirection d, TQWidget* parent )
+		: TQWidget( parent )
 {
 	m_pressed = false;
 	m_bitmap = TQBitmap( 8, 4, ( d == Up ? upbits : downbits ), true );
@@ -117,8 +117,8 @@ static unsigned char notstickybits[] = { 0x8, 0x1e, 0xc, 0xa, 0x1 };
 static unsigned char stickybits[]    = { 0xe, 0x11, 0x15, 0x11, 0xe };
 static unsigned char closebits[]     = { 0x11, 0xa, 0x4, 0xa, 0x11 };
 
-KoTinyButton::KoTinyButton( Action a, TQWidget* tqparent )
-		: TQWidget( tqparent ), m_action( a )
+KoTinyButton::KoTinyButton( Action a, TQWidget* parent )
+		: TQWidget( parent ), m_action( a )
 {
 	m_pressed = false;
 	m_toggled = false;
@@ -179,12 +179,12 @@ void KoTinyButton::mouseReleaseEvent( TQMouseEvent* )
 	}
 } // KoTinyButton::mouseReleaseEvent
 
-KoHelpView::KoHelpView( TQWidget* tqparent )
-		: TQWidget( tqparent )
+KoHelpView::KoHelpView( TQWidget* parent )
+		: TQWidget( parent )
 {
 	currentText = 0L;
 	setBackgroundMode( PaletteLight );
-	tqparent->installEventFilter( this );
+	parent->installEventFilter( this );
 	setMouseTracking( true );
 } // KoHelpView::KoHelpView
 
@@ -268,8 +268,8 @@ void KoHelpView::paintEvent( TQPaintEvent* )
 	currentText->draw( &p, 0, 0, TQRect(), tqcolorGroup() );
 } // KoHelpView::paintEvent
 
-KoHelpWidget::KoHelpWidget( TQString help, TQWidget* tqparent )
-		: TQWidget( tqparent )
+KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent )
+		: TQWidget( parent )
 {
 	TQGridLayout* tqlayout = new TQGridLayout( this, 3, 3 );
 	tqlayout->setMargin( 2 );
@@ -367,8 +367,8 @@ void KoHelpWidget::stopScrolling()
 	TQT_TQOBJECT(this)->killTimers();
 } // KoHelpWidget::stopScrolling
 
-KoContextHelpPopup::KoContextHelpPopup( TQWidget* tqparent )
-		: TQWidget( tqparent, "", WType_Dialog | WStyle_Customize | WStyle_NoBorder )
+KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent )
+		: TQWidget( parent, "", WType_Dialog | WStyle_Customize | WStyle_NoBorder )
 {
 	TQGridLayout* tqlayout = new TQGridLayout( this );
 	TQHBoxLayout* buttonLayout;
@@ -418,9 +418,9 @@ void KoContextHelpPopup::mouseMoveEvent( TQMouseEvent* e )
 
 void KoContextHelpPopup::resizeEvent( TQResizeEvent* )
 {
-	TQBitmap tqmask( width(), height() );
+	TQBitmap mask( width(), height() );
 	TQPointArray a;
-	TQPainter p( &tqmask );
+	TQPainter p( &mask );
 	p.fillRect( 0, 0, width(), height(), color1 );
 	p.setPen( color0 );
 	p.setBrush( color0 );
@@ -444,7 +444,7 @@ void KoContextHelpPopup::resizeEvent( TQResizeEvent* )
 	p.drawRect( width() - 2, 0, width() - 1, height() - 1 );
 	p.drawRect( width() - 4, height() - 4, width() - 2, height() - 2 );
 	p.end();
-	setMask( TQRegion( tqmask ) );
+	setMask( TQRegion( mask ) );
 } // KoContextHelpPopup::resizeEvent
 
 void KoContextHelpPopup::paintEvent( TQPaintEvent* )
@@ -507,8 +507,8 @@ void KoContextHelpPopup::keyReleaseEvent( TQKeyEvent* e )
 	}
 } // KoContextHelpPopup::keyPressEvent
 
-KoContextHelpAction::KoContextHelpAction( KActionCollection* tqparent, TQWidget* /*popupParent*/ )
-		: KToggleAction( i18n( "Context Help" ), BarIcon( "help" ), KShortcut( "CTRL+SHIFT+F1" ), 0, 0, tqparent, "help_context" )
+KoContextHelpAction::KoContextHelpAction( KActionCollection* parent, TQWidget* /*popupParent*/ )
+		: KToggleAction( i18n( "Context Help" ), BarIcon( "help" ), KShortcut( "CTRL+SHIFT+F1" ), 0, 0, parent, "help_context" )
 {
 	m_popup = new KoContextHelpPopup( 0L );
 	connect( m_popup, TQT_SIGNAL( wantsToBeClosed() ), this, TQT_SLOT( closePopup() ) );
@@ -533,8 +533,8 @@ void KoContextHelpAction::closePopup()
 } // KoContextHelpAction::closePopup
 
 
-KoContextHelpWidget::KoContextHelpWidget( TQWidget* tqparent, const char* name )
-		: TQWidget( tqparent, name )
+KoContextHelpWidget::KoContextHelpWidget( TQWidget* parent, const char* name )
+		: TQWidget( parent, name )
 {
 	setCaption( i18n( "Context Help" ) );
 	TQGridLayout* tqlayout = new TQGridLayout( this );
@@ -562,8 +562,8 @@ void KoContextHelpWidget::setContextHelp( const TQString& title, const TQString&
 } // KoContextHelpWidget::updateHelp
 
 
-KoContextHelpDocker::KoContextHelpDocker( TQWidget* tqparent, const char* name )
-		: TQDockWindow( tqparent, name )
+KoContextHelpDocker::KoContextHelpDocker( TQWidget* parent, const char* name )
+		: TQDockWindow( parent, name )
 {
 	setCaption( i18n( "Context Help" ) );
 	TQWidget* mainWidget = new TQWidget( this );
diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h
index b21eba5bc..889e006d3 100644
--- a/lib/kofficeui/KoContextCelp.h
+++ b/lib/kofficeui/KoContextCelp.h
@@ -36,7 +36,7 @@ class KoVerticalLabel : public TQWidget
   TQ_OBJECT
 	
 	public:
-		KoVerticalLabel( TQWidget* tqparent = 0, const char* name = 0 );
+		KoVerticalLabel( TQWidget* parent = 0, const char* name = 0 );
 		~KoVerticalLabel();
 		
 	public slots:
@@ -60,7 +60,7 @@ class KoHelpNavButton : public TQWidget
 			Down
 		};
 
-		KoHelpNavButton( NavDirection d, TQWidget* tqparent );
+		KoHelpNavButton( NavDirection d, TQWidget* parent );
 
 	signals:
 		void pressed();
@@ -87,7 +87,7 @@ class KoTinyButton : public TQWidget
 			Sticky
 		};
 
-		KoTinyButton( Action a, TQWidget* tqparent );
+		KoTinyButton( Action a, TQWidget* parent );
 
 	signals:
 		void clicked();
@@ -111,7 +111,7 @@ class KoHelpView : public TQWidget
   TQ_OBJECT
 
 	public:
-		KoHelpView( TQWidget* tqparent );
+		KoHelpView( TQWidget* parent );
 		~KoHelpView();
 
 		void setText( const TQString& text );
@@ -137,7 +137,7 @@ class KoHelpWidget : public TQWidget
   TQ_OBJECT
 
 	public:
-		KoHelpWidget( TQString help, TQWidget* tqparent );
+		KoHelpWidget( TQString help, TQWidget* parent );
 
 		void setText( TQString text );
 		void timerEvent( TQTimerEvent* );
@@ -174,7 +174,7 @@ class KoContextHelpPopup : public TQWidget
   TQ_OBJECT
 
 	public:
-		KoContextHelpPopup( TQWidget* tqparent = 0 );
+		KoContextHelpPopup( TQWidget* parent = 0 );
 		~KoContextHelpPopup();
 
 	public slots:
@@ -220,7 +220,7 @@ class KOFFICEUI_EXPORT KoContextHelpAction : public KToggleAction
   TQ_OBJECT
 
 	public:
-		KoContextHelpAction( KActionCollection* parentCollection, TQWidget* tqparent = 0 );
+		KoContextHelpAction( KActionCollection* parentCollection, TQWidget* parent = 0 );
 		virtual ~KoContextHelpAction();
 
 	public slots:
@@ -243,7 +243,7 @@ class KoContextHelpWidget : public TQWidget
   TQ_OBJECT
 
 	public:
-		KoContextHelpWidget( TQWidget* tqparent = 0, const char* name = 0 );
+		KoContextHelpWidget( TQWidget* parent = 0, const char* name = 0 );
 		~KoContextHelpWidget();
 
 	public slots:
@@ -267,7 +267,7 @@ class KoContextHelpDocker : public TQDockWindow
   TQ_OBJECT
 
 	public:
-		KoContextHelpDocker( TQWidget* tqparent = 0, const char* name = 0 );
+		KoContextHelpDocker( TQWidget* parent = 0, const char* name = 0 );
 		~KoContextHelpDocker();
 
 	public slots:
diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp
index f84431c72..963ee7e8a 100644
--- a/lib/kofficeui/KoEditPath.cpp
+++ b/lib/kofficeui/KoEditPath.cpp
@@ -32,8 +32,8 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-KoEditPathDia::KoEditPathDia( const TQString & _path, TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
+KoEditPathDia::KoEditPathDia( const TQString & _path, TQWidget *parent, const char *name )
+    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
 {
     setCaption( i18n("Edit Path") );
     TQWidget *page = new TQWidget( this );
@@ -67,8 +67,8 @@ TQString KoEditPathDia::newPath()const
 }
 
 
-KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
+KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *parent, const char *name )
+    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
 {
     setCaption( i18n("Edit Path") );
 
diff --git a/lib/kofficeui/KoEditPath.h b/lib/kofficeui/KoEditPath.h
index 0b56ccadc..2b45009c3 100644
--- a/lib/kofficeui/KoEditPath.h
+++ b/lib/kofficeui/KoEditPath.h
@@ -32,7 +32,7 @@ class KOFFICEUI_EXPORT KoEditPathDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoEditPathDia( const TQString & _path, TQWidget *tqparent, const char *name );
+    KoEditPathDia( const TQString & _path, TQWidget *parent, const char *name );
     TQString newPath()const;
 
 private:
@@ -45,7 +45,7 @@ class KOFFICEUI_EXPORT KoChangePathDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoChangePathDia( const TQString & _path, TQWidget *tqparent, const char *name );
+    KoChangePathDia( const TQString & _path, TQWidget *parent, const char *name );
     TQString newPath()const;
 private slots:
     void slotChangeDefaultValue( bool );
diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp
index f91627eca..a889b3d86 100644
--- a/lib/kofficeui/KoGuideLineDia.cpp
+++ b/lib/kofficeui/KoGuideLineDia.cpp
@@ -32,9 +32,9 @@
 #include <KoUnitWidgets.h>
 
 
-KoGuideLineDia::KoGuideLineDia( TQWidget *tqparent, double pos, double minPos, double maxPos,
+KoGuideLineDia::KoGuideLineDia( TQWidget *parent, double pos, double minPos, double maxPos,
                                 KoUnit::Unit unit, const char *name )
-: KDialogBase( tqparent, name , true, "", Ok | Cancel, Ok, true )
+: KDialogBase( parent, name , true, "", Ok | Cancel, Ok, true )
 , m_hButton( 0 )
 , m_vButton( 0 )
 {
@@ -46,9 +46,9 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *tqparent, double pos, double minPos, d
 }
 
 
-KoGuideLineDia::KoGuideLineDia( TQWidget *tqparent, KoPoint &pos, KoRect &rect,
+KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect,
                                 KoUnit::Unit unit, const char *name )
-: KDialogBase( tqparent, name , true, "", Ok | Cancel, Ok, true )
+: KDialogBase( parent, name , true, "", Ok | Cancel, Ok, true )
 , m_rect( rect )
 , m_pos( pos )
 , m_positionChanged( false )
diff --git a/lib/kofficeui/KoGuideLineDia.h b/lib/kofficeui/KoGuideLineDia.h
index 7dc9e0f8f..0f2fcecfd 100644
--- a/lib/kofficeui/KoGuideLineDia.h
+++ b/lib/kofficeui/KoGuideLineDia.h
@@ -42,14 +42,14 @@ public:
     /**
      * @brief Constructor
      *
-     * @param tqparent The tqparent widget
+     * @param parent The parent widget
      * @param pos the actual position of the guide line
      * @param minPos the minimal position of the guide line
      * @param maxPos the maximal position of the guide line
      * @param unit The unit used in the document
      * @param name The name is send to the TQObject constructor
      */
-    KoGuideLineDia( TQWidget *tqparent, double pos, double minPos, double maxPos,
+    KoGuideLineDia( TQWidget *parent, double pos, double minPos, double maxPos,
                     KoUnit::Unit unit, const char *name = 0L );
 
     /**
@@ -59,13 +59,13 @@ public:
      * and the orientation of the guide line is changed the value will be set to pos.x()
      * or pos.y() according to the orientation.
      *
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param pos the actual position of cursor
      * @param rect the rect in where the guide can be placed
      * @param unit the unit used in the document
      * @param name the name is send to the TQObject constructor
      */
-    KoGuideLineDia( TQWidget *tqparent, KoPoint &pos, KoRect &rect,
+    KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect,
                     KoUnit::Unit unit, const char *name = 0L );
     /**
      * @brief the position
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index 4c8639359..342889c42 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -36,10 +36,10 @@
 
 using namespace KOfficePrivate;
 
-KoInsertLinkDia::KoInsertLinkDia( TQWidget *tqparent, const char *name, bool displayBookmarkLink )
+KoInsertLinkDia::KoInsertLinkDia( TQWidget *parent, const char *name, bool displayBookmarkLink )
     : KDialogBase( KDialogBase::IconList, i18n("Insert Link"),
 		   KDialogBase::Ok | KDialogBase::Cancel,
-		   KDialogBase::Ok, tqparent, name )
+		   KDialogBase::Ok, parent, name )
 {
   bookmarkLink = 0L;
   TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("html",KIcon::SizeMedium));
@@ -98,11 +98,11 @@ void KoInsertLinkDia::slotTextChanged ( )
     currentText = linkName();
 }
 
-bool KoInsertLinkDia::createLinkDia(TQString & _linkName, TQString & _hrefName, const TQStringList& bkmlist, bool displayBookmarkLink, TQWidget* tqparent, const char* name)
+bool KoInsertLinkDia::createLinkDia(TQString & _linkName, TQString & _hrefName, const TQStringList& bkmlist, bool displayBookmarkLink, TQWidget* parent, const char* name)
 {
     bool res = false;
 
-    KoInsertLinkDia *dlg = new KoInsertLinkDia( tqparent, name, displayBookmarkLink );
+    KoInsertLinkDia *dlg = new KoInsertLinkDia( parent, name, displayBookmarkLink );
     dlg->setHrefLinkName(_hrefName,_linkName, bkmlist);
     if ( dlg->exec() == Accepted )
     {
@@ -217,8 +217,8 @@ void KoInsertLinkDia::slotOk()
 }
 
 
-internetLinkPage::internetLinkPage( TQWidget *tqparent , char *name  )
-  : TQWidget(tqparent,name)
+internetLinkPage::internetLinkPage( TQWidget *parent , char *name  )
+  : TQWidget(parent,name)
 {
   TQVBoxLayout *lay1 = new TQVBoxLayout( this );
   lay1->setSpacing( KDialog::spacingHint() );
@@ -290,8 +290,8 @@ void internetLinkPage::textChanged ( const TQString & )
     emit textChanged();
 }
 
-bookmarkLinkPage::bookmarkLinkPage( TQWidget *tqparent , char *name  )
-  : TQWidget(tqparent,name)
+bookmarkLinkPage::bookmarkLinkPage( TQWidget *parent , char *name  )
+  : TQWidget(parent,name)
 {
   TQVBoxLayout *lay1 = new TQVBoxLayout( this );
   lay1->setSpacing( KDialog::spacingHint() );
@@ -372,8 +372,8 @@ void bookmarkLinkPage::textChanged ( const TQString & )
     emit textChanged();
 }
 
-mailLinkPage::mailLinkPage( TQWidget *tqparent , char *name  )
-  : TQWidget(tqparent,name)
+mailLinkPage::mailLinkPage( TQWidget *parent , char *name  )
+  : TQWidget(parent,name)
 {
   TQVBoxLayout *lay1 = new TQVBoxLayout( this );
   lay1->setSpacing( KDialog::spacingHint() );
@@ -442,8 +442,8 @@ void mailLinkPage::textChanged ( const TQString & )
     emit textChanged();
 }
 
-fileLinkPage::fileLinkPage( TQWidget *tqparent , char *name  )
-  : TQWidget(tqparent,name)
+fileLinkPage::fileLinkPage( TQWidget *parent , char *name  )
+  : TQWidget(parent,name)
 {
   TQVBoxLayout *lay1 = new TQVBoxLayout( this );
   lay1->setSpacing( KDialog::spacingHint() );
diff --git a/lib/kofficeui/KoInsertLink.h b/lib/kofficeui/KoInsertLink.h
index cb10a7f05..d71263aac 100644
--- a/lib/kofficeui/KoInsertLink.h
+++ b/lib/kofficeui/KoInsertLink.h
@@ -34,7 +34,7 @@ class internetLinkPage : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    internetLinkPage( TQWidget *tqparent = 0, char *name = 0 );
+    internetLinkPage( TQWidget *parent = 0, char *name = 0 );
     TQString linkName()const;
     TQString hrefName();
     void setLinkName(const TQString & _name);
@@ -56,7 +56,7 @@ class bookmarkLinkPage : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    bookmarkLinkPage( TQWidget *tqparent = 0, char *name = 0 );
+    bookmarkLinkPage( TQWidget *parent = 0, char *name = 0 );
     TQString linkName()const;
     TQString hrefName();
     void setLinkName(const TQString & _name);
@@ -80,7 +80,7 @@ class mailLinkPage : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    mailLinkPage( TQWidget *tqparent = 0, char *name = 0 );
+    mailLinkPage( TQWidget *parent = 0, char *name = 0 );
     TQString linkName()const;
     TQString hrefName();
     void setLinkName(const TQString & _name);
@@ -103,7 +103,7 @@ class fileLinkPage : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    fileLinkPage( TQWidget *tqparent = 0, char *name = 0 );
+    fileLinkPage( TQWidget *parent = 0, char *name = 0 );
     TQString linkName()const;
     TQString hrefName();
     void setLinkName(const TQString & _name);
@@ -129,9 +129,9 @@ class KOFFICEUI_EXPORT KoInsertLinkDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoInsertLinkDia( TQWidget *tqparent, const char *name = 0,bool displayBookmarkLink=true );
+    KoInsertLinkDia( TQWidget *parent, const char *name = 0,bool displayBookmarkLink=true );
     static bool createLinkDia(TQString & linkName, TQString & hrefName, const TQStringList& bkmlist, bool displayBookmarkLink = true,
-                              TQWidget* tqparent = 0, const char* name = 0);
+                              TQWidget* parent = 0, const char* name = 0);
 
     //internal
     TQString linkName() const;
diff --git a/lib/kofficeui/KoPageLayoutColumns.cpp b/lib/kofficeui/KoPageLayoutColumns.cpp
index 60057c88e..8ea3b0b96 100644
--- a/lib/kofficeui/KoPageLayoutColumns.cpp
+++ b/lib/kofficeui/KoPageLayoutColumns.cpp
@@ -25,8 +25,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *tqparent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
-    : KoPageLayoutColumnsBase(tqparent) {
+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", tqlayout );
diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h
index 09bad9d5c..8ebac1b2e 100644
--- a/lib/kofficeui/KoPageLayoutColumns.h
+++ b/lib/kofficeui/KoPageLayoutColumns.h
@@ -40,12 +40,12 @@ class KoPageLayoutColumns : public KoPageLayoutColumnsBase {
 public:
     /**
      * Contructor
-     * @param tqparent the tqparent widget
+     * @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 tqlayout the page tqlayout that the preview should be initialzed with.
      */
-    KoPageLayoutColumns(TQWidget *tqparent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
+    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
 
     /**
      * Update the page preview widget with the param tqlayout.
diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp
index 1f07358a0..0b410bf1d 100644
--- a/lib/kofficeui/KoPageLayoutDia.cpp
+++ b/lib/kofficeui/KoPageLayoutDia.cpp
@@ -49,8 +49,8 @@
 /******************************************************************/
 
 /*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* tqparent, const char *name, const KoPageLayout& tqlayout )
-    : TQGroupBox( i18n( "Page Preview" ), tqparent, name )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
+    : TQGroupBox( i18n( "Page Preview" ), parent, name )
 {
     setPageLayout( tqlayout );
     columns = 1;
@@ -128,12 +128,12 @@ void KoPagePreview::drawContents( TQPainter *painter )
 /******************************************************************/
 
 /*==================== constructor ===============================*/
-KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name,
+KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
                                   const KoPageLayout& tqlayout,
                                   const KoHeadFoot& hf, int tabs,
                                   KoUnit::Unit unit, bool modal )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
-                   KDialogBase::Ok, tqparent, name, modal)
+                   KDialogBase::Ok, parent, name, modal)
 {
 
     flags = tabs;
@@ -153,14 +153,14 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name,
 }
 
 /*==================== constructor ===============================*/
-KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name,
+KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
                   const KoPageLayout& tqlayout,
                   const KoHeadFoot& hf,
                   const KoColumns& columns,
                   const KoKWHeaderFooter& kwhf,
                   int tabs, KoUnit::Unit unit )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
-                   KDialogBase::Ok, tqparent, name, true)
+                   KDialogBase::Ok, parent, name, true)
 {
     flags = tabs;
 
@@ -186,10 +186,10 @@ KoPageLayoutDia::~KoPageLayoutDia()
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* tqparent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( tqparent, "PageLayout", tqlayout, hf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
@@ -205,10 +205,10 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta
 
 /*======================= show dialog ============================*/
 bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
-                                  KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* tqparent )
+                                  KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( tqparent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
diff --git a/lib/kofficeui/KoPageLayoutDia.h b/lib/kofficeui/KoPageLayoutDia.h
index 05f8f3db7..21fe7df34 100644
--- a/lib/kofficeui/KoPageLayoutDia.h
+++ b/lib/kofficeui/KoPageLayoutDia.h
@@ -90,7 +90,7 @@ public:
     /**
      *  Constructor.
      *
-     *  @param tqparent   The tqparent of the dialog.
+     *  @param parent   The parent of the dialog.
      *  @param name     The name of the dialog.
      *  @param tqlayout   The tqlayout.
      *  @param headfoot The header and the footer.
@@ -98,7 +98,7 @@ public:
      *  @param unit     The unit to use for displaying the values to the user.
      *  @param modal    Whether the dialog is modal or not.
      */
-    KoPageLayoutDia( TQWidget* tqparent, const char* name,
+    KoPageLayoutDia( TQWidget* parent, const char* name,
              const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              int flags, KoUnit::Unit unit, bool modal=true );
@@ -106,7 +106,7 @@ public:
     /**
      *  Constructor.
      *
-     *  @param tqparent     The tqparent of the dialog.
+     *  @param parent     The parent of the dialog.
      *  @param name       The name of the dialog.
      *  @param tqlayout     The tqlayout.
      *  @param headfoot   The header and the footer.
@@ -115,7 +115,7 @@ public:
      *  @param tabs       The number of tabs.
      *  @param unit       The unit to use for displaying the values to the user
      */
-    KoPageLayoutDia( TQWidget* tqparent, const char* name,
+    KoPageLayoutDia( TQWidget* parent, const char* name,
              const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              const KoColumns& columns,
@@ -131,13 +131,13 @@ public:
      *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
-    static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* tqparent = 0 );
+    static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
 
     /**
      *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
-    static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* tqparent = 0 );
+    static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
     /**
      *  Retrieves a standard page tqlayout.
      *  Deprecated: better use KoPageLayout::standardLayout()
diff --git a/lib/kofficeui/KoPageLayoutHeader.cpp b/lib/kofficeui/KoPageLayoutHeader.cpp
index b436447b3..002969573 100644
--- a/lib/kofficeui/KoPageLayoutHeader.cpp
+++ b/lib/kofficeui/KoPageLayoutHeader.cpp
@@ -23,8 +23,8 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *tqparent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf)
-    : KoPageLayoutHeaderBase(tqparent) {
+KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf)
+    : KoPageLayoutHeaderBase(parent) {
     m_headerFooters = kwhf;
     TQHBoxLayout *lay = new TQHBoxLayout(headerSpacingPane);
     m_headerSpacing = new KoUnitDoubleSpinBox( headerSpacingPane, 0.0, 999.0, 0.5, kwhf.ptHeaderBodySpacing, unit );
diff --git a/lib/kofficeui/KoPageLayoutHeader.h b/lib/kofficeui/KoPageLayoutHeader.h
index da97f34ce..5473403b4 100644
--- a/lib/kofficeui/KoPageLayoutHeader.h
+++ b/lib/kofficeui/KoPageLayoutHeader.h
@@ -37,11 +37,11 @@ class KoPageLayoutHeader : public KoPageLayoutHeaderBase {
 public:
     /**
      * Contructor
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
      * @param kwhf the data that this widget will be filled with initially
      */
-    KoPageLayoutHeader(TQWidget *tqparent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf);
+    KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf);
     /**
      * @return the altered data as it is currently set by the user.
      */
diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp
index c191f5658..6ddf9409e 100644
--- a/lib/kofficeui/KoPageLayoutSize.cpp
+++ b/lib/kofficeui/KoPageLayoutSize.cpp
@@ -34,8 +34,8 @@
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h>
 
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *tqparent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
-    : TQWidget(tqparent), m_blockSignals(false) {
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
+    : TQWidget(parent), m_blockSignals(false) {
     m_layout = tqlayout;
     m_unit = unit;
 
diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h
index f1f4f3589..d917b349f 100644
--- a/lib/kofficeui/KoPageLayoutSize.h
+++ b/lib/kofficeui/KoPageLayoutSize.h
@@ -41,14 +41,14 @@ class KoPageLayoutSize : public TQWidget {
 public:
     /**
      * Contructor
-     * @param tqparent the tqparent widget
+     * @param parent the parent widget
      * @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 *tqparent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
+    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
             const KoColumns& columns, bool unitChooser, bool enableBorders);
 
     /**
diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp
index d563e9068..ca24b89ad 100644
--- a/lib/kofficeui/KoPartSelectAction.cpp
+++ b/lib/kofficeui/KoPartSelectAction.cpp
@@ -21,23 +21,23 @@
 
 #include <kdebug.h>
 
-KoPartSelectAction::KoPartSelectAction( const TQString& text, TQObject* tqparent, const char* name )
-    : KActionMenu( text, tqparent, name )
+KoPartSelectAction::KoPartSelectAction( const TQString& text, TQObject* parent, const char* name )
+    : KActionMenu( text, parent, name )
 {
     init();
 }
 
 KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& icon,
-                                        TQObject* tqparent, const char* name )
-    : KActionMenu( text, icon, tqparent, name )
+                                        TQObject* parent, const char* name )
+    : KActionMenu( text, icon, parent, name )
 {
     init();
 }
 
 KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& icon,
                                         TQObject* receiver, const char* slot,
-                                        TQObject* tqparent, const char* name )
-    : KActionMenu( text, icon, tqparent, name )
+                                        TQObject* parent, const char* name )
+    : KActionMenu( text, icon, parent, name )
 {
     if (receiver)
         connect( this, TQT_SIGNAL( activated() ), receiver, slot );
diff --git a/lib/kofficeui/KoPartSelectAction.h b/lib/kofficeui/KoPartSelectAction.h
index f6a69e737..9e9dd30f2 100644
--- a/lib/kofficeui/KoPartSelectAction.h
+++ b/lib/kofficeui/KoPartSelectAction.h
@@ -33,11 +33,11 @@ class KOFFICEUI_EXPORT KoPartSelectAction : public KActionMenu
   TQ_OBJECT
 
 public:
-    KoPartSelectAction( const TQString& text, TQObject* tqparent = 0, const char* name = 0 );
+    KoPartSelectAction( const TQString& text, TQObject* parent = 0, const char* name = 0 );
     KoPartSelectAction( const TQString& text, const TQString& icon,
-                        TQObject* tqparent = 0, const char* name = 0 );
+                        TQObject* parent = 0, const char* name = 0 );
     KoPartSelectAction( const TQString& text, const TQString& icon,
-                        TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
+                        TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 
     KoDocumentEntry documentEntry() const { return m_documentEntry; }
 
diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp
index 4c3e376ec..b5271b971 100644
--- a/lib/kofficeui/KoPartSelectDia.cpp
+++ b/lib/kofficeui/KoPartSelectDia.cpp
@@ -29,8 +29,8 @@
  *
  ****************************************************/
 
-KoPartSelectDia::KoPartSelectDia( TQWidget* tqparent, const char* name ) :
-    KDialogBase( tqparent, name, TRUE, i18n("Insert Object"), KDialogBase::Ok | KDialogBase::Cancel )
+KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) :
+    KDialogBase( parent, name, TRUE, i18n("Insert Object"), KDialogBase::Ok | KDialogBase::Cancel )
 {
     listview = new TQListView( this );
     listview->addColumn( i18n( "Object" ) );
@@ -76,11 +76,11 @@ KoDocumentEntry KoPartSelectDia::entry()
     return KoDocumentEntry();
 }
 
-KoDocumentEntry KoPartSelectDia::selectPart( TQWidget *tqparent )
+KoDocumentEntry KoPartSelectDia::selectPart( TQWidget *parent )
 {
     KoDocumentEntry e;
 
-    KoPartSelectDia *dlg = new KoPartSelectDia( tqparent, "PartSelect" );
+    KoPartSelectDia *dlg = new KoPartSelectDia( parent, "PartSelect" );
     dlg->setFocus();
     if (dlg->exec() == TQDialog::Accepted)
 	e = dlg->entry();
diff --git a/lib/kofficeui/KoPartSelectDia.h b/lib/kofficeui/KoPartSelectDia.h
index f131a857a..6a13084b3 100644
--- a/lib/kofficeui/KoPartSelectDia.h
+++ b/lib/kofficeui/KoPartSelectDia.h
@@ -43,7 +43,7 @@ public:
     /**
      *  Constructor.
      */
-    KoPartSelectDia( TQWidget* tqparent = 0, const char* name = 0 );
+    KoPartSelectDia( TQWidget* parent = 0, const char* name = 0 );
 
     /**
      *  Retrieves the result of the part selection.
@@ -58,7 +58,7 @@ public:
      *  @returns the KoDocumentEntry of the selected KOffice components
      *           or an empty entry.
      */
-    static KoDocumentEntry selectPart( TQWidget *tqparent = 0L );
+    static KoDocumentEntry selectPart( TQWidget *parent = 0L );
 
 private slots:
     void selectionChanged( TQListViewItem * );
diff --git a/lib/kofficeui/KoPictureFilePreview.cpp b/lib/kofficeui/KoPictureFilePreview.cpp
index 3f44f1e9b..7baed8f9d 100644
--- a/lib/kofficeui/KoPictureFilePreview.cpp
+++ b/lib/kofficeui/KoPictureFilePreview.cpp
@@ -41,8 +41,8 @@
 class KoPictureFilePreviewWidget : public TQScrollView
 {
 public:
-    KoPictureFilePreviewWidget( TQWidget *tqparent )
-        : TQScrollView( tqparent ) { viewport()->setBackgroundMode( PaletteBase ); }
+    KoPictureFilePreviewWidget( TQWidget *parent )
+        : TQScrollView( parent ) { viewport()->setBackgroundMode( PaletteBase ); }
 
     bool setPicture( const KURL& url )
     {
@@ -88,8 +88,8 @@ private:
     TQSize m_size;
 };
 
-KoPictureFilePreview::KoPictureFilePreview( TQWidget *tqparent )
-    : KPreviewWidgetBase( tqparent )
+KoPictureFilePreview::KoPictureFilePreview( TQWidget *parent )
+    : KPreviewWidgetBase( parent )
 {
     TQVBoxLayout *vb = new TQVBoxLayout( this, KDialog::marginHint() );
     m_widget = new KoPictureFilePreviewWidget( this );
diff --git a/lib/kofficeui/KoPictureFilePreview.h b/lib/kofficeui/KoPictureFilePreview.h
index 820f9b10a..3922cd747 100644
--- a/lib/kofficeui/KoPictureFilePreview.h
+++ b/lib/kofficeui/KoPictureFilePreview.h
@@ -36,7 +36,7 @@ class KOFFICEUI_EXPORT KoPictureFilePreview : public KPreviewWidgetBase
   TQ_OBJECT
 
 public:
-    KoPictureFilePreview( TQWidget *tqparent );
+    KoPictureFilePreview( TQWidget *parent );
 
     /**
      * @return a list of patterns of all supported clipart formats.
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 9fd10314a..2742ff112 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -52,7 +52,7 @@ class KoSelectAction::KoSelectActionPrivate
 };
 
 KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon,
-  TQObject* tqparent, const char* name) : KAction(text, icon, 0, tqparent, name)
+  TQObject* parent, const char* name) : KAction(text, icon, 0, parent, name)
 {
   d = new KoSelectActionPrivate;
   setShowCurrentSelection(true);
@@ -61,7 +61,7 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon,
 }
 
 KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const TQObject* receiver,
-  const char* slot, TQObject* tqparent, const char* name) : KAction(text, icon, 0, tqparent, name)
+  const char* slot, TQObject* parent, const char* name) : KAction(text, icon, 0, parent, name)
 {
   d = new KoSelectActionPrivate;
   
diff --git a/lib/kofficeui/KoSelectAction.h b/lib/kofficeui/KoSelectAction.h
index 4bad1005c..a6d3b006a 100644
--- a/lib/kofficeui/KoSelectAction.h
+++ b/lib/kofficeui/KoSelectAction.h
@@ -36,20 +36,20 @@ class KOFFICEUI_EXPORT KoSelectAction : public KAction
     /** Constructs a KoSelectAction with a text and an icon.
      * @param text The text that will be displayed.
      * @param icon The dynamically loaded icon that goes with this action.
-     * @param tqparent This action's tqparent.
+     * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KoSelectAction(const TQString& text, const TQString& icon, TQObject* tqparent = 0, const char* name = 0);
+    KoSelectAction(const TQString& text, const TQString& icon, TQObject* parent = 0, const char* name = 0);
     /** Same as above, but it also connects a slot to the selectionChanged(int) signal.
      * @param text The text that will be displayed.
      * @param icon The dynamically loaded icon that goes with this action.
-     * @param receiver The SLOT's tqparent.
+     * @param receiver The SLOT's parent.
      * @param slot The TQT_SLOT to invoke when a selectionChanged(int) signal is emited.
-     * @param tqparent This action's tqparent.
+     * @param parent This action's parent.
      * @param name An internal name for this action.
      */
     KoSelectAction(const TQString& text, const TQString& icon, const TQObject* receiver,
-      const char* slot, TQObject* tqparent, const char* name = 0);
+      const char* slot, TQObject* parent, const char* name = 0);
     ~KoSelectAction();
 
     /** Returns a pointer to the popup menu. */
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index 7c0beeebf..e33ce12c2 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -347,8 +347,8 @@ void KoTabBarPrivate::updateButtons()
 }
 
 // creates a new tabbar
-KoTabBar::KoTabBar( TQWidget* tqparent, const char* name )
-    : TQWidget( tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase )
+KoTabBar::KoTabBar( TQWidget* parent, const char* name )
+    : TQWidget( parent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase )
 {
     d = new KoTabBarPrivate;
     d->tabbar = this;
diff --git a/lib/kofficeui/KoTabBar.h b/lib/kofficeui/KoTabBar.h
index 1ab9d6dc7..39cf03b8c 100644
--- a/lib/kofficeui/KoTabBar.h
+++ b/lib/kofficeui/KoTabBar.h
@@ -73,7 +73,7 @@ public:
     /**
      * Creates a new tabbar.
      */
-    KoTabBar( TQWidget* tqparent = 0, const char *name = 0 );
+    KoTabBar( TQWidget* parent = 0, const char *name = 0 );
 
     /**
      * Destroy the tabbar.
diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp
index 71a123420..ed891e890 100644
--- a/lib/kofficeui/KoTabChooser.cpp
+++ b/lib/kofficeui/KoTabChooser.cpp
@@ -43,8 +43,8 @@ public:
 /******************************************************************/
 
 /*================================================================*/
-KoTabChooser::KoTabChooser( TQWidget *tqparent, int _flags )
-    : TQFrame( tqparent, "" )
+KoTabChooser::KoTabChooser( TQWidget *parent, int _flags )
+    : TQFrame( parent, "" )
 {
     setFrameStyle( MenuBarPanel );
     flags = _flags;
diff --git a/lib/kofficeui/KoTabChooser.h b/lib/kofficeui/KoTabChooser.h
index f479ff940..31ad0f859 100644
--- a/lib/kofficeui/KoTabChooser.h
+++ b/lib/kofficeui/KoTabChooser.h
@@ -44,7 +44,7 @@ public:
            TAB_DEC_PNT = 8,
            TAB_ALL = TAB_LEFT | TAB_CENTER | TAB_RIGHT | TAB_DEC_PNT };
 
-    KoTabChooser( TQWidget *tqparent, int _flags );
+    KoTabChooser( TQWidget *parent, int _flags );
     ~KoTabChooser();
 
     int getCurrTabType() { return currType; }
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 280a875c3..3d1609edc 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -62,10 +62,10 @@ class MyFileDialog : public KFileDialog
         MyFileDialog(
                 const TQString& startDir=0,
                 const TQString& filter =0,
-                TQWidget *tqparent=0,
+                TQWidget *parent=0,
                 const char *name=0,
                 bool modal=0)
-            :  KFileDialog (startDir, filter, tqparent, name, modal),
+            :  KFileDialog (startDir, filter, parent, name, modal),
         m_slotOkCalled( false ) {}
 
         KURL currentURL()
@@ -178,13 +178,13 @@ class KoTemplateChooseDiaPrivate {
 /******************************************************************/
 
 /*================================================================*/
-KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *tqparent, const char *name, KInstance* instance,
+KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance,
                                          const TQCString &format,
                                          const TQString &nativeName,
                                          const TQStringList &extraNativeMimeTypes,
                                          const DialogType &dialogType,
                                          const TQCString& templateType) :
-    KDialogBase(tqparent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel,
+    KDialogBase(parent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel,
                 KDialogBase::Ok)
 {
     d = new KoTemplateChooseDiaPrivate(
@@ -230,7 +230,7 @@ static bool cancelQuits() {
 KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file,
                                                             const KoTemplateChooseDia::DialogType &dialogType,
                                                             const TQCString& templateType,
-                                                            TQWidget* tqparent)
+                                                            TQWidget* parent)
 {
     const TQString nativeName = instance->aboutData()->programName();
     const TQCString format = KoDocument::readNativeFormatMimeType( instance );
@@ -238,7 +238,7 @@ KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance,
     // Maybe the above two can be combined into one call, for speed:
     //KoDocument::getNativeMimeTypeInfo( instance, nativeName, extraNativeMimeTypes );
     return choose( instance, file, format, nativeName, extraNativeMimeTypes,
-                   dialogType, templateType, tqparent );
+                   dialogType, templateType, parent );
 }
 
 KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file,
@@ -247,10 +247,10 @@ KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance,
                                        const TQStringList& extraNativeMimeTypes,
                                        const DialogType &dialogType,
                                        const TQCString& templateType,
-                                       TQWidget* tqparent )
+                                       TQWidget* parent )
 {
     KoTemplateChooseDia *dlg = new KoTemplateChooseDia(
-        tqparent, "Choose", instance, format,
+        parent, "Choose", instance, format,
         nativeName, extraNativeMimeTypes, dialogType, templateType );
 
     KoTemplateChooseDia::ReturnType rt = Cancel;
diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h
index 98188ad15..677c11b19 100644
--- a/lib/kofficeui/KoTemplateChooseDia.h
+++ b/lib/kofficeui/KoTemplateChooseDia.h
@@ -45,8 +45,8 @@ class KoTCDIconCanvas : public KIconCanvas
     Q_OBJECT
   TQ_OBJECT
     public:
-	KoTCDIconCanvas( TQWidget *tqparent = 0, const char *name = 0L )
-	    : KIconCanvas( tqparent, name ) {}
+	KoTCDIconCanvas( TQWidget *parent = 0, const char *name = 0L )
+	    : KIconCanvas( parent, name ) {}
 
 	bool isCurrentValid() { return currentItem(); }
 	TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, KInstance* instance);
@@ -64,13 +64,13 @@ class KoTCDIconCanvas : public KIconCanvas
 class KoTCDIconViewItem : public KIconViewItem
 {
     public:
-	KoTCDIconViewItem(TQIconView *tqparent=0)
-	    : KIconViewItem ( tqparent )
+	KoTCDIconViewItem(TQIconView *parent=0)
+	    : KIconViewItem ( parent )
 	    {}
 
-	KoTCDIconViewItem(TQIconView *tqparent=0, const TQString &text=0, const TQPixmap &icon=0,
+	KoTCDIconViewItem(TQIconView *parent=0, const TQString &text=0, const TQPixmap &icon=0,
                       const TQString &descr=0, const TQString &fullname=0)
-	    : KIconViewItem(tqparent, text, icon)
+	    : KIconViewItem(parent, text, icon)
 	    {
             m_descr = descr;
             m_full = fullname;
@@ -96,8 +96,8 @@ class KoTCDRecentFilesIconView : public KFileIconView {
     Q_OBJECT
   TQ_OBJECT
     public:
-	KoTCDRecentFilesIconView( TQWidget* tqparent, const char* name ) :
-		KFileIconView( tqparent, name ), toolTip(0)
+	KoTCDRecentFilesIconView( TQWidget* parent, const char* name ) :
+		KFileIconView( parent, name ), toolTip(0)
 	{
 	    connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ),
                      TQT_SLOT( showToolTip( TQIconViewItem * ) ) );
@@ -168,13 +168,13 @@ public:
      * @param dialogType the type of the dialog
      * @param templateType the template type of your application (see kword or
      *        kpresenter for details)
-     * @param tqparent pointer to tqparent widget
+     * @param parent pointer to parent widget
      * @return The return type (see above)
      */
     static ReturnType choose(KInstance* instance, TQString &file,
                              const DialogType &dialogType,
                              const TQCString& templateType,
-                             TQWidget* tqparent);
+                             TQWidget* parent);
 
 private:
     /// Ditto, with extraNativeMimeTypes added
@@ -184,7 +184,7 @@ private:
                              const TQStringList& extraNativeMimeTypes,
                              const DialogType &dialogType=Everything,
                              const TQCString& templateType="",
-                             TQWidget* tqparent = 0);
+                             TQWidget* parent = 0);
 public:
 
     /**
@@ -213,7 +213,7 @@ protected slots:
 private:
     /**
      *
-     * @param tqparent tqparent the tqparent of the dialog
+     * @param parent parent the parent of the dialog
      * @param name the TQt internal name
      * @param instance the KInstance of your app
      * @param format is the mimetype of the app (e.g. application/x-kspread)
@@ -224,7 +224,7 @@ private:
      *
      * @return The return type (see above)
      */
-    KoTemplateChooseDia(TQWidget *tqparent, const char *name, KInstance* instance,
+    KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance,
                         const TQCString &format,
                         const TQString &nativeName,
                         const TQStringList &extraNativeMimeTypes,
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 213e694f1..6243b9dcb 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -55,7 +55,7 @@
 
 class KoTemplateCreateDiaPrivate {
 public:
-    KoTemplateCreateDiaPrivate( TQWidget* /*tqparent*/, KInstance * instance)
+    KoTemplateCreateDiaPrivate( TQWidget* /*parent*/, KInstance * instance)
          : m_instance( instance ), m_tempFile( TQString(), ".png" )
     {
         m_tree=0L;
@@ -98,11 +98,11 @@ public:
  ****************************************************************************/
 
 KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstance *instance,
-                                          const TQString &file, const TQPixmap &pix, TQWidget *tqparent ) :
-    KDialogBase( tqparent, "template create dia", true, i18n( "Create Template" ),
+                                          const TQString &file, const TQPixmap &pix, TQWidget *parent ) :
+    KDialogBase( parent, "template create dia", true, i18n( "Create Template" ),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok ), m_file(file), m_pixmap(pix) {
 
-    d=new KoTemplateCreateDiaPrivate( tqparent, instance );
+    d=new KoTemplateCreateDiaPrivate( parent, instance );
 
     TQFrame *mainwidget=makeMainWidget();
     TQHBoxLayout *mbox=new TQHBoxLayout(mainwidget, 0, KDialogBase::spacingHint());
@@ -201,9 +201,9 @@ void KoTemplateCreateDia::slotSelectionChanged()
 }
 
 void KoTemplateCreateDia::createTemplate( const TQCString &templateType, KInstance *instance,
-                                          const TQString &file, const TQPixmap &pix, TQWidget *tqparent ) {
+                                          const TQString &file, const TQPixmap &pix, TQWidget *parent ) {
 
-    KoTemplateCreateDia *dia = new KoTemplateCreateDia( templateType, instance, file, pix, tqparent );
+    KoTemplateCreateDia *dia = new KoTemplateCreateDia( templateType, instance, file, pix, parent );
     dia->exec();
     delete dia;
 }
@@ -221,7 +221,7 @@ void KoTemplateCreateDia::slotOk() {
     }
     // is it a group or a template? anyway - get the group :)
     if(item->depth()!=0)
-        item=item->tqparent();
+        item=item->parent();
     if(!item) {    // *very* safe :P
         d->m_tree->writeTemplateTree();
         KDialogBase::slotCancel();
diff --git a/lib/kofficeui/KoTemplateCreateDia.h b/lib/kofficeui/KoTemplateCreateDia.h
index 659a9f994..821d2f270 100644
--- a/lib/kofficeui/KoTemplateCreateDia.h
+++ b/lib/kofficeui/KoTemplateCreateDia.h
@@ -46,11 +46,11 @@ class KOFFICEUI_EXPORT KoTemplateCreateDia : public KDialogBase
 
 public:
     KoTemplateCreateDia( const TQCString &templateType, KInstance *instance,
-                         const TQString &file, const TQPixmap &pix, TQWidget *tqparent=0L );
+                         const TQString &file, const TQPixmap &pix, TQWidget *parent=0L );
     ~KoTemplateCreateDia();
 
     static void createTemplate( const TQCString &templateType, KInstance *instance,
-                                const TQString &file, const TQPixmap &pix, TQWidget *tqparent=0L );
+                                const TQString &file, const TQPixmap &pix, TQWidget *parent=0L );
 
 protected:
     void slotOk();
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index eea6a2903..db4d6467c 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -91,9 +91,9 @@ void KoToolBox::registerTool( KAction *tool, int toolType, TQ_UINT32 priority )
     (*tl)[prio] = tool;
 }
 
-TQToolButton *KoToolBox::createButton(TQWidget * tqparent,  const char* iconName, TQString tooltip)
+TQToolButton *KoToolBox::createButton(TQWidget * parent,  const char* iconName, TQString tooltip)
 {
-    TQToolButton *button = new TQToolButton(tqparent);
+    TQToolButton *button = new TQToolButton(parent);
 
     if ( iconName && *iconName ) {
         TQPixmap pixmap = BarIcon( iconName, m_instance );
@@ -193,8 +193,8 @@ void KoToolBox::slotSetTool(const TQString & toolname)
 //                         class ToolArea
 
 
-ToolArea::ToolArea(TQWidget *tqparent)
-    : TQWidget(tqparent), m_left(true)
+ToolArea::ToolArea(TQWidget *parent)
+    : TQWidget(parent), m_left(true)
 {
     m_layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0, 0);
     TQWidget *w = new TQWidget(this);
diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 9a04986e6..764ce4c11 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -74,7 +74,7 @@ public slots:
 
 private:
 
-    TQToolButton * createButton(TQWidget * tqparent, const char* iconName, TQString tooltip);
+    TQToolButton * createButton(TQWidget * parent, const char* iconName, TQString tooltip);
 
 
 private:
@@ -95,7 +95,7 @@ private:
 class ToolArea : public TQWidget {
 
 public:
-    ToolArea(TQWidget *tqparent);
+    ToolArea(TQWidget *parent);
     ~ToolArea();
 
     void  setOrientation ( Qt::Orientation o );
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 9f500bb1f..7260bbea6 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -41,8 +41,8 @@ namespace {
     int ARROW_WIDTH = 12;
 }
 
-KoColorPanel::KoColorPanel( TQWidget* tqparent, const char* name ) :
-    TQWidget( tqparent, name, WStaticContents | WRepaintNoErase | WResizeNoErase )
+KoColorPanel::KoColorPanel( TQWidget* parent, const char* name ) :
+    TQWidget( parent, name, WStaticContents | WRepaintNoErase | WResizeNoErase )
 {
     setMouseTracking( true );
     setAcceptDrops( true );
@@ -65,9 +65,9 @@ TQSize KoColorPanel::tqminimumSizeHint() const
 
 TQPopupMenu* KoColorPanel::createColorPopup( KoColorPanel::MenuStyle style, const TQColor& defaultColor,
                                             const TQObject* receiver, const char* slot,
-                                            TQWidget* tqparent, const char* name )
+                                            TQWidget* parent, const char* name )
 {
-    TQPopupMenu* menu = new TQPopupMenu( tqparent, name );
+    TQPopupMenu* menu = new TQPopupMenu( parent, name );
     KoColorPopupProxy* proxy = 0;
 
     if ( defaultColor.isValid() ) {
@@ -613,8 +613,8 @@ bool operator<( const KoColorPanel::Position& lhs, const KoColorPanel::Position&
 }
 
 
-KoColorPopupProxy::KoColorPopupProxy( const TQColor& defaultColor, KoColorPanel* recentColors, TQObject* tqparent, const char* name ) :
-    TQObject( tqparent, name ), m_defaultColor( defaultColor ), m_recentColors( recentColors )
+KoColorPopupProxy::KoColorPopupProxy( const TQColor& defaultColor, KoColorPanel* recentColors, TQObject* parent, const char* name ) :
+    TQObject( parent, name ), m_defaultColor( defaultColor ), m_recentColors( recentColors )
 {
 }
 
@@ -635,8 +635,8 @@ void KoColorPopupProxy::slotMoreColors()
 
     TQColor newColor;
     TQWidget* p = 0;
-    if ( tqparent() && tqparent()->isWidgetType() )
-        p = TQT_TQWIDGET( tqparent() );
+    if ( parent() && parent()->isWidgetType() )
+        p = TQT_TQWIDGET( parent() );
 
     if ( KColorDialog::getColor( newColor, p ) == TQDialog::Accepted ) {
         m_recentColors->insertColor( newColor );
@@ -645,16 +645,16 @@ void KoColorPopupProxy::slotMoreColors()
 }
 
 
-KoToolButton::KoToolButton( const TQString& icon, int id, TQWidget* tqparent,
+KoToolButton::KoToolButton( const TQString& icon, int id, TQWidget* parent,
                             const char* name, const TQString& txt, KInstance* _instance ) :
-    KToolBarButton( icon, id, tqparent, name, txt, _instance ), m_arrowPressed( false )
+    KToolBarButton( icon, id, parent, name, txt, _instance ), m_arrowPressed( false )
 {
     init();
 }
 
-KoToolButton::KoToolButton( const TQPixmap& pixmap, int id, TQWidget* tqparent,
+KoToolButton::KoToolButton( const TQPixmap& pixmap, int id, TQWidget* parent,
                             const char* name, const TQString& txt ) :
-    KToolBarButton( pixmap, id, tqparent, name, txt ), m_arrowPressed( false )
+    KToolBarButton( pixmap, id, parent, name, txt ), m_arrowPressed( false )
 {
     init();
 }
diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h
index d4c339443..1374f6d28 100644
--- a/lib/kofficeui/KoTooluButton.h
+++ b/lib/kofficeui/KoTooluButton.h
@@ -31,7 +31,7 @@ class KoColorPanel : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoColorPanel( TQWidget* tqparent = 0, const char* name = 0 );
+    KoColorPanel( TQWidget* parent = 0, const char* name = 0 );
     virtual ~KoColorPanel();
 
     virtual TQSize tqsizeHint() const;
@@ -40,7 +40,7 @@ public:
     enum MenuStyle { Plain, CustomColors };
     static TQPopupMenu* createColorPopup( MenuStyle style, const TQColor& defaultColor,
                                          const TQObject* receiver, const char* slot,
-                                         TQWidget* tqparent, const char* name );
+                                         TQWidget* parent, const char* name );
 
 public slots:
     void clear();
@@ -108,7 +108,7 @@ class KoColorPopupProxy : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoColorPopupProxy( const TQColor& defaultColor, KoColorPanel* recentColors, TQObject* tqparent, const char* name );
+    KoColorPopupProxy( const TQColor& defaultColor, KoColorPanel* recentColors, TQObject* parent, const char* name );
     virtual ~KoColorPopupProxy() {}
 
     void setRecentColorPanel( KoColorPanel* recentColors );
@@ -139,11 +139,11 @@ public:
      *
      * @param icon   Name of icon to load (may be absolute or relative)
      * @param id     Id of this button
-     * @param tqparent This button's tqparent
+     * @param parent This button's parent
      * @param name   This button's internal name
      * @param txt    This button's text (in a tooltip or otherwise)
      */
-    KoToolButton( const TQString& icon, int id, TQWidget* tqparent,
+    KoToolButton( const TQString& icon, int id, TQWidget* parent,
                   const char* name = 0L, const TQString& txt = TQString(),
                   KInstance* _instance = KGlobal::instance() );
 
@@ -154,11 +154,11 @@ public:
      *
      * @param icon   Name of icon to load (may be absolute or relative)
      * @param id     Id of this button
-     * @param tqparent This button's tqparent
+     * @param parent This button's parent
      * @param name   This button's internal name
      * @param txt    This button's text (in a tooltip or otherwise)
      */
-    KoToolButton( const TQPixmap& pixmap, int id, TQWidget* tqparent,
+    KoToolButton( const TQPixmap& pixmap, int id, TQWidget* parent,
                   const char* name = 0L, const TQString& txt = TQString() );
 
     virtual ~KoToolButton();
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index a9b4fbcf2..476e35b34 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -31,8 +31,8 @@
 //                          Support classes
 
 
-KoUnitDoubleValidator::KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *tqparent, const char *name )
-: KDoubleValidator( tqparent, name ), m_base( base )
+KoUnitDoubleValidator::KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *parent, const char *name )
+: KDoubleValidator( parent, name ), m_base( base )
 {
 }
 
@@ -117,8 +117,8 @@ double KoUnitDoubleBase::toDouble( const TQString& str, bool* ok ) const
 //                          Widget classes
 
 
-KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, const char *name )
-    : KDoubleSpinBox( tqparent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 )
+KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name )
+    : KDoubleSpinBox( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 )
     , m_lowerInPoints( -9999 )
     , m_upperInPoints( 9999 )
     , m_stepInPoints( 1 )
@@ -133,14 +133,14 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, const char *name )
 }
 
 
-KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, 
+KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, 
 						    double lower, double upper,
 						    double step, 
 						    double value, 
 						    KoUnit::Unit unit, 
 						    unsigned int precision, 
 						    const char *name )
-    : KDoubleSpinBox( lower, upper, step, value, precision, tqparent, name ),
+    : KDoubleSpinBox( lower, upper, step, value, precision, parent, name ),
       KoUnitDoubleBase( unit, precision ),
     m_lowerInPoints( lower ), m_upperInPoints( upper ), m_stepInPoints( step )
 {
@@ -219,8 +219,8 @@ void KoUnitDoubleSpinBox::setMinMaxStep( double min, double max, double step )
 // ----------------------------------------------------------------
 
 
-KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, const char *name )
-    : KLineEdit( tqparent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ),
+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 )
 {
     tqsetAlignment( TQt::AlignRight );
@@ -230,9 +230,9 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, const char *name
     changeValue(  KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) );
 }
 
-KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, double lower, double upper, double value, KoUnit::Unit unit,
+KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit,
     unsigned int precision, const char *name )
-    : KLineEdit( tqparent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
+    : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
     m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     tqsetAlignment( TQt::AlignRight );
@@ -284,8 +284,8 @@ double KoUnitDoubleLineEdit::value( void ) const
 // ----------------------------------------------------------------
 
 
-KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, const char *name )
-     : KComboBox( true, tqparent, 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 )
+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()->tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
@@ -295,9 +295,9 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, const char *name
     connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
 }
 
-KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, double lower, double upper, double value, KoUnit::Unit unit,
+KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit,
      unsigned int precision, const char *name )
-     : KComboBox( true, tqparent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
+     : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
      m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     lineEdit()->tqsetAlignment( TQt::AlignRight );
@@ -376,8 +376,8 @@ double KoUnitDoubleComboBox::value( void ) const
 // ----------------------------------------------------------------
 
 
-KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, const char *name )
-    : TQWidget( tqparent ), m_step( 1.0 )
+KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name )
+    : TQWidget( parent ), m_step( 1.0 )
 {
     TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
     //tqlayout->setMargin( 2 );
@@ -399,9 +399,9 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, const ch
     tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
-KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, double lower, double upper, double step, double value,
+KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value,
                                                     KoUnit::Unit unit, unsigned int precision, const char *name )
-    : TQWidget( tqparent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
+    : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
     //tqlayout->setMargin( 2 );
diff --git a/lib/kofficeui/KoUnitWidgets.h b/lib/kofficeui/KoUnitWidgets.h
index dbdcb9c0c..80db554d1 100644
--- a/lib/kofficeui/KoUnitWidgets.h
+++ b/lib/kofficeui/KoUnitWidgets.h
@@ -44,7 +44,7 @@ class KoUnitDoubleBase;
 class KOFFICEUI_EXPORT KoUnitDoubleValidator : public KDoubleValidator
 {
 public:
-    KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *tqparent, const char *name = 0 );
+    KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *parent, const char *name = 0 );
 
     virtual TQValidator::State validate( TQString &, int & ) const;
 
@@ -109,9 +109,9 @@ class KOFFICEUI_EXPORT KoUnitDoubleSpinBox : public KDoubleSpinBox, public KoUni
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleSpinBox( TQWidget *tqparent = 0L, const char *name = 0L );
+    KoUnitDoubleSpinBox( TQWidget *parent = 0L, const char *name = 0L );
     // lower, upper, step and value are in pt
-    KoUnitDoubleSpinBox( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0,
+    KoUnitDoubleSpinBox( TQWidget *parent, double lower, double upper, double step, double value = 0.0,
                          KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
     // added so the class can be used in .ui files(by Tymoteusz Majewski, maju7@o2.pl)
     virtual void changeValue( double );
@@ -136,7 +136,7 @@ public:
     void setMinMaxStep( double min, double max, double step );
 
 signals:
-    /// emitted like valueChanged in the tqparent, but this one emits the point value
+    /// emitted like valueChanged in the parent, but this one emits the point value
     void valueChangedPt( double );
 
 
@@ -160,8 +160,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleLineEdit : public KLineEdit, public KoUnitDou
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleLineEdit( TQWidget *tqparent = 0L, const char *name = 0L );
-    KoUnitDoubleLineEdit( TQWidget *tqparent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
+    KoUnitDoubleLineEdit( TQWidget *parent = 0L, const char *name = 0L );
+    KoUnitDoubleLineEdit( TQWidget *parent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
 
     virtual void changeValue( double );
     virtual void setUnit( KoUnit::Unit = KoUnit::U_PT );
@@ -189,8 +189,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleComboBox : public KComboBox, public KoUnitDou
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleComboBox( TQWidget *tqparent = 0L, const char *name = 0L );
-    KoUnitDoubleComboBox( TQWidget *tqparent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
+    KoUnitDoubleComboBox( TQWidget *parent = 0L, const char *name = 0L );
+    KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
 
     virtual void changeValue( double );
     void updateValue( double );
@@ -226,8 +226,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleSpinComboBox : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoUnitDoubleSpinComboBox( TQWidget *tqparent = 0L, const char *name = 0L );
-    KoUnitDoubleSpinComboBox( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
+    KoUnitDoubleSpinComboBox( TQWidget *parent = 0L, const char *name = 0L );
+    KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
 
     void insertItem( double, int index = -1 );
     void updateValue( double );
diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp
index bebe70556..7f9e41392 100644
--- a/lib/kofficeui/KoZoomAction.cpp
+++ b/lib/kofficeui/KoZoomAction.cpp
@@ -26,15 +26,15 @@
 #include <klocale.h>
 
 KoZoomAction::KoZoomAction( const TQString& text, const TQIconSet& pix, 
-  const KShortcut& cut, TQObject* tqparent, const char* name ):
-  KSelectAction( text, pix, cut, tqparent, name )
+  const KShortcut& cut, TQObject* parent, const char* name ):
+  KSelectAction( text, pix, cut, parent, name )
 {
   init();
 }
       
 KoZoomAction::KoZoomAction( const TQString& text, const TQString& pix, 
-  const KShortcut& cut, TQObject* tqparent, const char* name ):
-  KSelectAction( text, pix, cut, tqparent, name )
+  const KShortcut& cut, TQObject* parent, const char* name ):
+  KSelectAction( text, pix, cut, parent, name )
 {
   init();
   
diff --git a/lib/kofficeui/KoZoomAction.h b/lib/kofficeui/KoZoomAction.h
index d714259ad..932c409a8 100644
--- a/lib/kofficeui/KoZoomAction.h
+++ b/lib/kofficeui/KoZoomAction.h
@@ -39,13 +39,13 @@ public:
    * Creates a new zoom action.
    */
   KoZoomAction( const TQString& text, const TQIconSet& pix, 
-    const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 );
+    const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 );
       
   /**
    * Creates a new zoom action.
    */
   KoZoomAction( const TQString& text, const TQString& pix, 
-    const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 );
+    const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 );
       
 public slots:
 
diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp
index 0ef475183..5fa296f0d 100644
--- a/lib/kofficeui/Kolinestyleaction.cpp
+++ b/lib/kofficeui/Kolinestyleaction.cpp
@@ -43,7 +43,7 @@ class KoLineStyleAction::KoLineStyleActionPrivate
 };
 
 KoLineStyleAction::KoLineStyleAction(const TQString &text, const TQString& icon,
-  TQObject* tqparent, const char* name) : KoSelectAction(text, icon, tqparent, name)
+  TQObject* parent, const char* name) : KoSelectAction(text, icon, parent, name)
 {
   d = new KoLineStyleActionPrivate;
    
@@ -51,7 +51,7 @@ KoLineStyleAction::KoLineStyleAction(const TQString &text, const TQString& icon,
 }
 
 KoLineStyleAction::KoLineStyleAction(const TQString &text, const TQString& icon, const TQObject* receiver,
-  const char* slot, TQObject* tqparent, const char* name) : KoSelectAction(text, icon, receiver, slot, tqparent, name)
+  const char* slot, TQObject* parent, const char* name) : KoSelectAction(text, icon, receiver, slot, parent, name)
 {
   d = new KoLineStyleActionPrivate;
   
@@ -66,7 +66,7 @@ KoLineStyleAction::~KoLineStyleAction()
 void KoLineStyleAction::createMenu()
 {
   KPopupMenu* popup = popupMenu();
-  TQBitmap tqmask;
+  TQBitmap mask;
   TQPixmap pix(70, 21);
   TQPainter p(&pix, popup);
   int cindex = 0;
@@ -79,8 +79,8 @@ void KoLineStyleAction::createMenu()
     pen.setStyle(static_cast<Qt::PenStyle>(i));
     p.setPen(pen);
     p.drawLine(0, 10, pix.width(), 10);
-    tqmask = pix;
-    pix.setMask(tqmask);
+    mask = pix;
+    pix.setMask(mask);
     popup->insertItem(pix,cindex++);
   }
 }
diff --git a/lib/kofficeui/Kolinestyleaction.h b/lib/kofficeui/Kolinestyleaction.h
index 6d8d9e919..63be979cf 100644
--- a/lib/kofficeui/Kolinestyleaction.h
+++ b/lib/kofficeui/Kolinestyleaction.h
@@ -31,20 +31,20 @@ class KOFFICEUI_EXPORT KoLineStyleAction : public KoSelectAction
     /** Constructs a KoLineStyleAction with a text and an icon.
      * @param text The text that will be displayed.
      * @param icon The dynamically loaded icon that goes with this action.
-     * @param tqparent This action's tqparent.
+     * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KoLineStyleAction(const TQString& text, const TQString& icon, TQObject* tqparent = 0, const char* name = 0);
+    KoLineStyleAction(const TQString& text, const TQString& icon, TQObject* parent = 0, const char* name = 0);
     /** Same as above, but it also connects a slot to the selectionChanged(int) signal.
      * @param text The text that will be displayed.
      * @param icon The dynamically loaded icon that goes with this action.
-     * @param receiver The SLOT's tqparent.
+     * @param receiver The SLOT's parent.
      * @param slot The TQT_SLOT to invoke when a selectionChanged(int) signal is emited.
-     * @param tqparent This action's tqparent.
+     * @param parent This action's parent.
      * @param name An internal name for this action.
      */
     KoLineStyleAction(const TQString& text, const TQString& icon, const TQObject* receiver,
-      const char* slot, TQObject* tqparent, const char* name = 0);
+      const char* slot, TQObject* parent, const char* name = 0);
     ~KoLineStyleAction();
     
   protected:
diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp
index 6b693d3c8..c812c1c6b 100644
--- a/lib/kofficeui/Kolinewidthaction.cpp
+++ b/lib/kofficeui/Kolinewidthaction.cpp
@@ -56,7 +56,7 @@ class KoLineWidthAction::KoLineWidthActionPrivate
 };
 
 KoLineWidthAction::KoLineWidthAction(const TQString &text, const TQString& icon,
-  TQObject* tqparent, const char* name) : KoSelectAction(text, icon, tqparent, name)
+  TQObject* parent, const char* name) : KoSelectAction(text, icon, parent, name)
 {
   d = new KoLineWidthActionPrivate;
 
@@ -64,7 +64,7 @@ KoLineWidthAction::KoLineWidthAction(const TQString &text, const TQString& icon,
 }
 
 KoLineWidthAction::KoLineWidthAction(const TQString &text, const TQString& icon, const TQObject* receiver,
-  const char* slot, TQObject* tqparent, const char* name) : KoSelectAction(text, icon, tqparent, name)
+  const char* slot, TQObject* parent, const char* name) : KoSelectAction(text, icon, parent, name)
 {
   d = new KoLineWidthActionPrivate;
 
@@ -81,7 +81,7 @@ KoLineWidthAction::~KoLineWidthAction()
 void KoLineWidthAction::createMenu()
 {
   KPopupMenu* popup = popupMenu();
-  TQBitmap tqmask;
+  TQBitmap mask;
   TQPixmap pix(70, 21);
   TQPainter p(&pix, popup);
   int cindex = 0;
@@ -92,8 +92,8 @@ void KoLineWidthAction::createMenu()
     pen.setWidth(tqRound(i * POINT_TO_INCH(static_cast<double>(KoGlobal::dpiY()))));
     p.setPen(pen);
     p.drawLine(0, 10, pix.width(), 10);
-    tqmask = pix;
-    pix.setMask(tqmask);
+    mask = pix;
+    pix.setMask(mask);
     popup->insertItem(pix,cindex++);
   }
 
@@ -162,8 +162,8 @@ class KoLineWidthChooser::KoLineWidthChooserPrivate
     KoUnitDoubleSpinBox* m_lineWidthUSBox;
 };
 
-KoLineWidthChooser::KoLineWidthChooser(TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, i18n("Custom Line Width"), Ok|Cancel, Ok)
+KoLineWidthChooser::KoLineWidthChooser(TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, i18n("Custom Line Width"), Ok|Cancel, Ok)
 {
   d = new KoLineWidthChooserPrivate;
 
diff --git a/lib/kofficeui/Kolinewidthaction.h b/lib/kofficeui/Kolinewidthaction.h
index 31991fb48..a2b1dfe48 100644
--- a/lib/kofficeui/Kolinewidthaction.h
+++ b/lib/kofficeui/Kolinewidthaction.h
@@ -35,20 +35,20 @@ class KOFFICEUI_EXPORT KoLineWidthAction : public KoSelectAction
     /** Constructs a KoLineWidthAction with a text and an icon.
      * @param text The text that will be displayed.
      * @param icon The dynamically loaded icon that goes with this action.
-     * @param tqparent This action's tqparent.
+     * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KoLineWidthAction(const TQString& text, const TQString& icon, TQObject* tqparent = 0, const char* name = 0);
+    KoLineWidthAction(const TQString& text, const TQString& icon, TQObject* parent = 0, const char* name = 0);
     /** Same as above, but it also connects a slot to the selectionChanged(int) signal.
      * @param text The text that will be displayed.
      * @param icon The dynamically loaded icon that goes with this action.
-     * @param receiver The SLOT's tqparent.
+     * @param receiver The SLOT's parent.
      * @param slot The TQT_SLOT to invoke when a lineWidthChanged(double) signal is emited.
-     * @param tqparent This action's tqparent.
+     * @param parent This action's parent.
      * @param name An internal name for this action.
      */
     KoLineWidthAction(const TQString& text, const TQString& icon, const TQObject* receiver,
-      const char* slot, TQObject* tqparent, const char* name = 0);
+      const char* slot, TQObject* parent, const char* name = 0);
     ~KoLineWidthAction();
 
     /** Returns the currently selected line width */
@@ -90,7 +90,7 @@ class KoLineWidthChooser : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    KoLineWidthChooser(TQWidget* tqparent = 0, const char* name = 0);
+    KoLineWidthChooser(TQWidget* parent = 0, const char* name = 0);
     ~KoLineWidthChooser();
 
     /** Returns the selected line width in points. */
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index 2a9b383e5..c0da86e93 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -29,41 +29,41 @@
 #include <kdebug.h>
 
 KColorAction::KColorAction( const TQString& text, int accel,
-			    TQObject* tqparent, const char* name )
-    : KAction( text, accel, tqparent, name )
+			    TQObject* parent, const char* name )
+    : KAction( text, accel, parent, name )
 {
     typ = TextColor;
     init();
 }
 
 KColorAction::KColorAction( const TQString& text, int accel,
-			    TQObject* receiver, const char* slot, TQObject* tqparent,
+			    TQObject* receiver, const char* slot, TQObject* parent,
 			    const char* name )
-    : KAction( text, accel, receiver, slot, tqparent, name )
+    : KAction( text, accel, receiver, slot, parent, name )
 {
     typ = TextColor;
     init();
 }
 
 KColorAction::KColorAction( const TQString& text, Type type, int accel,
-			    TQObject* tqparent, const char* name )
-    : KAction( text, accel, tqparent, name )
+			    TQObject* parent, const char* name )
+    : KAction( text, accel, parent, name )
 {
     typ = type;
     init();
 }
 
 KColorAction::KColorAction( const TQString& text, Type type, int accel,
-			    TQObject* receiver, const char* slot, TQObject* tqparent,
+			    TQObject* receiver, const char* slot, TQObject* parent,
 			    const char* name )
-    : KAction( text, accel, receiver, slot, tqparent, name )
+    : KAction( text, accel, receiver, slot, parent, name )
 {
     typ = type;
     init();
 }
 
-KColorAction::KColorAction( TQObject* tqparent, const char* name )
-    : KAction( tqparent, name )
+KColorAction::KColorAction( TQObject* parent, const char* name )
+    : KAction( parent, name )
 {
     typ = TextColor;
     init();
@@ -218,8 +218,8 @@ void KColorAction::createPixmap()
 
 KSelectColorAction::KSelectColorAction( const TQString& text, Type type,
                                         const TQObject* receiver, const char* slot,
-                                        KActionCollection* tqparent, const char* name ) :
-    KAction( text, KShortcut(), receiver, slot, tqparent, name ), m_type( type ),
+                                        KActionCollection* parent, const char* name ) :
+    KAction( text, KShortcut(), receiver, slot, parent, name ), m_type( type ),
     m_color( TQt::black )
 {
 }
diff --git a/lib/kofficeui/kcoloractions.h b/lib/kofficeui/kcoloractions.h
index 22910672b..8f2c713bf 100644
--- a/lib/kofficeui/kcoloractions.h
+++ b/lib/kofficeui/kcoloractions.h
@@ -39,16 +39,16 @@ public:
     };
 
     // Create default (text) color action
-    KColorAction( const TQString& text, int accel = 0, TQObject* tqparent = 0, const char* name = 0 );
+    KColorAction( const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 );
     KColorAction( const TQString& text, int accel,
-		  TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
-    KColorAction( TQObject* tqparent = 0, const char* name = 0 );
+		  TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
+    KColorAction( TQObject* parent = 0, const char* name = 0 );
 
     // Create a color action of a given type
     KColorAction( const TQString& text, Type type, int accel = 0,
-		  TQObject* tqparent = 0, const char* name = 0 );
+		  TQObject* parent = 0, const char* name = 0 );
     KColorAction( const TQString& text, Type type, int accel,
-		  TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
+		  TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 
     virtual void setColor( const TQColor &c );
     TQColor color() const;
@@ -78,7 +78,7 @@ public:
 
     KSelectColorAction( const TQString& text, Type type,
                         const TQObject* receiver, const char* slot,
-                        KActionCollection* tqparent, const char* name );
+                        KActionCollection* parent, const char* name );
     virtual ~KSelectColorAction();
 
     virtual int plug( TQWidget* w, int index = -1 );
diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp
index 1ce9f42a5..729285bb8 100644
--- a/lib/kofficeui/tests/coloraction_test.cpp
+++ b/lib/kofficeui/tests/coloraction_test.cpp
@@ -34,7 +34,7 @@
 #include <time.h>
 
 
-TopLevel::TopLevel( TQWidget* tqparent, const char* name) : TQMainWindow( tqparent, name )
+TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, name )
 {
     setCaption( TQString::tqfromLatin1( "KColorAction test application" ) );
 
diff --git a/lib/kofficeui/tests/coloraction_test.h b/lib/kofficeui/tests/coloraction_test.h
index a2f0f2cf3..d0847493d 100644
--- a/lib/kofficeui/tests/coloraction_test.h
+++ b/lib/kofficeui/tests/coloraction_test.h
@@ -30,7 +30,7 @@ class TopLevel : public TQMainWindow
     Q_OBJECT
   TQ_OBJECT
 public:
-    TopLevel( TQWidget* tqparent = 0, const char* name = 0 );
+    TopLevel( TQWidget* parent = 0, const char* name = 0 );
 
 public slots:
     void insertRandomColor();
diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index 4af7d8d9f..6a7d198a7 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -41,8 +41,8 @@
     }                                                                    \
   }
 
-TKAction::TKAction(TQObject* tqparent, const char* name)
-: KAction( "", 0, tqparent, name )
+TKAction::TKAction(TQObject* parent, const char* name)
+: KAction( "", 0, parent, name )
 {
   m_imode = TK::IconOnly;
 }
@@ -120,9 +120,9 @@ void TKAction::updateLayout()
   }
 }
 
-TQWidget* TKAction::createLayout(TQWidget* tqparent, TQWidget* tqchildren)
+TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* tqchildren)
 {
-  TQWidget* base = new TQWidget(tqparent,"KTToolBarLayout");
+  TQWidget* base = new TQWidget(parent,"KTToolBarLayout");
   TQLabel* textLabel = new TQLabel(base,"text");
   textLabel->setMinimumHeight(1);
   TQLabel* pixLabel = new TQLabel(base,"pixmap");
@@ -171,8 +171,8 @@ void TKAction::updateLayout(TQWidget* base)
                        (pixLabel->isVisible() ? pixLabel->tqsizeHint().width():0) );
 }
 /******************************************************************************/
-TKBaseSelectAction::TKBaseSelectAction( TQObject* tqparent, const char* name )
-: TKAction(tqparent,name)
+TKBaseSelectAction::TKBaseSelectAction( TQObject* parent, const char* name )
+: TKAction(parent,name)
 {
   m_current = 0;
   m_editable = false;
@@ -248,8 +248,8 @@ void TKBaseSelectAction::activate(int id)
   emit activated(id);
 }
 /******************************************************************************/
-TKSelectAction::TKSelectAction( TQObject* tqparent, const char* name )
-: TKBaseSelectAction(tqparent,name)
+TKSelectAction::TKSelectAction( TQObject* parent, const char* name )
+: TKBaseSelectAction(parent,name)
 {
 }
 
diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h
index 119fbc852..26b4069da 100644
--- a/lib/kofficeui/tkaction.h
+++ b/lib/kofficeui/tkaction.h
@@ -34,7 +34,7 @@ class KOFFICEUI_EXPORT TKAction : public KAction
 { Q_OBJECT
   TQ_OBJECT
 public:
-  TKAction(TQObject* tqparent, const char* name);
+  TKAction(TQObject* parent, const char* name);
   ~TKAction();
 
   virtual int plug(TQWidget* widget, int index = -1);
@@ -44,7 +44,7 @@ public:
 protected:
   virtual void initToolBarButton(TKToolBarButton*);
 
-  TQWidget* createLayout(TQWidget* tqparent, TQWidget* tqchildren);
+  TQWidget* createLayout(TQWidget* parent, TQWidget* tqchildren);
   void updateLayout();
   virtual void updateLayout(TQWidget*);
 
@@ -64,7 +64,7 @@ class KOFFICEUI_EXPORT TKBaseSelectAction : public TKAction
   TQ_OBJECT
 friend class TKSelectAction;
 public:
-  TKBaseSelectAction(TQObject* tqparent, const char* name);
+  TKBaseSelectAction(TQObject* parent, const char* name);
   ~TKBaseSelectAction();
 
   virtual int plug(TQWidget* widget, int index = -1);
@@ -98,7 +98,7 @@ class KOFFICEUI_EXPORT TKSelectAction : public TKBaseSelectAction
 { Q_OBJECT
   TQ_OBJECT
 public:
-  TKSelectAction(TQObject* tqparent, const char* name);
+  TKSelectAction(TQObject* parent, const char* name);
   ~TKSelectAction();
 
   TQStringList items() const;
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index 1f17efb67..1449d0fbb 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -32,8 +32,8 @@
 #include <kdebug.h>
 #include <tqapplication.h>
 
-TKColorPopupMenu::TKColorPopupMenu( TQWidget* tqparent, const char* name )
-: KPopupMenu(tqparent,name)
+TKColorPopupMenu::TKColorPopupMenu( TQWidget* parent, const char* name )
+: KPopupMenu(parent,name)
 {
 }
 
@@ -57,8 +57,8 @@ public:
 };
 
 
-TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObject* tqparent, const char* name, bool menuDefaultColor )
-: TKAction(tqparent,name)
+TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor )
+: TKAction(parent,name)
 {
     d=new TKSelectColorActionPrivate();
     d->defaultColorMenu=menuDefaultColor;
@@ -70,8 +70,8 @@ TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObj
 
 TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type,
                                           TQObject* receiver, const char* slot,
-                                          TQObject* tqparent, const char* name, bool menuDefaultColor)
-: TKAction(tqparent,name)
+                                          TQObject* parent, const char* name, bool menuDefaultColor)
+: TKAction(parent,name)
 {
     d=new TKSelectColorActionPrivate();
     d->defaultColorMenu=menuDefaultColor;
@@ -297,8 +297,8 @@ public:
 };
 
 /****************************************************************************************/
-TKColorPanel::TKColorPanel( TQWidget* tqparent, const char* name )
-: TQWidget(tqparent,name)
+TKColorPanel::TKColorPanel( TQWidget* parent, const char* name )
+: TQWidget(parent,name)
 {
   d = new TKColorPanel::TKColorPanelPrivate();
   m_activeColor = black;
@@ -574,8 +574,8 @@ void TKColorPanel::fillPanel()
 }
 
 /****************************************************************************************/
-TKColorPanelButton::TKColorPanelButton( const TQColor& color, TQWidget* tqparent, const char* name )
-: TQFrame(tqparent,name), m_Color(color), m_bActive(false)
+TKColorPanelButton::TKColorPanelButton( const TQColor& color, TQWidget* parent, const char* name )
+: TQFrame(parent,name), m_Color(color), m_bActive(false)
 {
   setFixedSize(16,16);
   setFrameStyle( NoFrame );
diff --git a/lib/kofficeui/tkcoloractions.h b/lib/kofficeui/tkcoloractions.h
index 0c5ccb1ab..b478e2ddd 100644
--- a/lib/kofficeui/tkcoloractions.h
+++ b/lib/kofficeui/tkcoloractions.h
@@ -34,7 +34,7 @@ class TKColorPopupMenu : public KPopupMenu
 { Q_OBJECT
   TQ_OBJECT
 public:
-  TKColorPopupMenu( TQWidget* tqparent = 0, const char* name = 0 );
+  TKColorPopupMenu( TQWidget* parent = 0, const char* name = 0 );
   ~TKColorPopupMenu();
 
 public slots:
@@ -52,10 +52,10 @@ public:
     Color
   };
 
-  TKSelectColorAction( const TQString& text, Type type, TQObject* tqparent, const char* name, bool menuDefaultColor=false);
+  TKSelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor=false);
   TKSelectColorAction( const TQString& text, Type type,
                        TQObject* receiver, const char* slot,
-                       TQObject* tqparent, const char* name,bool menuDefaultColor=false );
+                       TQObject* parent, const char* name,bool menuDefaultColor=false );
 
   virtual ~TKSelectColorAction();
 
@@ -102,7 +102,7 @@ class TKColorPanelButton : public TQFrame
 { Q_OBJECT
   TQ_OBJECT
 public:
-  TKColorPanelButton( const TQColor&, TQWidget* tqparent, const char* name = 0 );
+  TKColorPanelButton( const TQColor&, TQWidget* parent, const char* name = 0 );
   ~TKColorPanelButton();
 
   void setActive( bool );
@@ -131,7 +131,7 @@ class TKColorPanel : public TQWidget
   TQ_OBJECT
 
 public:
-  TKColorPanel( TQWidget* tqparent = 0L, const char* name = 0 );
+  TKColorPanel( TQWidget* parent = 0L, const char* name = 0 );
   ~TKColorPanel();
 
   void setActiveColor( const TQColor& );
diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp
index 903f394e6..d1cb7ac20 100644
--- a/lib/kofficeui/tkcombobox.cpp
+++ b/lib/kofficeui/tkcombobox.cpp
@@ -26,14 +26,14 @@
 
 #include <kapplication.h>
 
-TKComboBox::TKComboBox(TQWidget* tqparent, const char* name)
-: TQComboBox(false,tqparent,name)
+TKComboBox::TKComboBox(TQWidget* parent, const char* name)
+: TQComboBox(false,parent,name)
 {
 }
 
 
-TKComboBox::TKComboBox( bool isEditable, TQWidget* tqparent, const char* name )
-: TQComboBox(isEditable,tqparent,name)
+TKComboBox::TKComboBox( bool isEditable, TQWidget* parent, const char* name )
+: TQComboBox(isEditable,parent,name)
 {
 }
 
diff --git a/lib/kofficeui/tkcombobox.h b/lib/kofficeui/tkcombobox.h
index 5ddcc5637..066e9b936 100644
--- a/lib/kofficeui/tkcombobox.h
+++ b/lib/kofficeui/tkcombobox.h
@@ -25,8 +25,8 @@ class TKComboBox : public TQComboBox
 { Q_OBJECT
   TQ_OBJECT
 public:
-  TKComboBox(TQWidget* tqparent=0, const char* name=0);
-  TKComboBox(bool isEditable, TQWidget* tqparent=0, const char* name=0);
+  TKComboBox(TQWidget* parent=0, const char* name=0);
+  TKComboBox(bool isEditable, TQWidget* parent=0, const char* name=0);
   ~TKComboBox();
 
   void activate();
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index fa36390e5..9b2cb29c9 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -89,9 +89,9 @@ public:
 };
 
 TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt,
-                                        TQWidget* tqparent, const char* name,
+                                        TQWidget* parent, const char* name,
                                         KInstance *instance )
-: TQToolButton(tqparent,name)
+: TQToolButton(parent,name)
 {
   d = new TKToolBarButtonPrivate;
   d->m_text = txt;
@@ -109,8 +109,8 @@ TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt,
   modeChange();
 }
 
-TKToolBarButton::TKToolBarButton( const TQPixmap& pixmap, const TQString& txt, TQWidget* tqparent, const char* name )
-: TQToolButton(tqparent,name )
+TKToolBarButton::TKToolBarButton( const TQPixmap& pixmap, const TQString& txt, TQWidget* parent, const char* name )
+: TQToolButton(parent,name )
 {
   d = new TKToolBarButtonPrivate;
   d->m_text = txt;
diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h
index 680c19b19..3cec2f575 100644
--- a/lib/kofficeui/tktoolbarbutton.h
+++ b/lib/kofficeui/tktoolbarbutton.h
@@ -36,10 +36,10 @@ class TKToolBarButton : public TQToolButton
   TQ_OBJECT
 public:
   TKToolBarButton(const TQString& icon, const TQString& txt,
-                     TQWidget* tqparent = 0, const char *name=0L,
+                     TQWidget* parent = 0, const char *name=0L,
                      KInstance *_instance = KGlobal::instance());
 
-  TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* tqparent=0, const char* name=0);
+  TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0);
   ~TKToolBarButton();
 
   void setIconMode(TK::IconMode);
diff --git a/lib/kopainter/koColorChooser.cc b/lib/kopainter/koColorChooser.cc
index 7f2a7d58d..e2406a796 100644
--- a/lib/kopainter/koColorChooser.cc
+++ b/lib/kopainter/koColorChooser.cc
@@ -32,7 +32,7 @@
 #include <koFrameButton.h>
 #include <koColorSlider.h>
 
-KoColorChooser::KoColorChooser(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
+KoColorChooser::KoColorChooser(TQWidget *parent, const char *name) : TQWidget(parent, name)
 {
   m_current = 0;
   m_tab = new TQTabWidget(this, "KoColorChooser tab");
@@ -95,7 +95,7 @@ void KoColorChooser::slotChangeColor(const KoColor &c)
 }
 
 /*           RGBWidget         */
-RGBWidget::RGBWidget(TQWidget *tqparent) : ColorWidget(tqparent)
+RGBWidget::RGBWidget(TQWidget *parent) : ColorWidget(parent)
 {
   TQGridLayout *mGrid = new TQGridLayout(this, 4, 5);
 
@@ -160,7 +160,7 @@ RGBWidget::RGBWidget(TQWidget *tqparent) : ColorWidget(tqparent)
   connect(mBIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBInChanged(int)));
 }
 
-ColorWidget::ColorWidget(TQWidget *tqparent) : TQWidget(tqparent)
+ColorWidget::ColorWidget(TQWidget *parent) : TQWidget(parent)
 {
 }
 
@@ -276,7 +276,7 @@ void RGBWidget::slotPatchChanged(const TQColor& clr)
 
 /*           HSVWidget         */
 
-HSVWidget::HSVWidget(TQWidget *tqparent): ColorWidget(tqparent)
+HSVWidget::HSVWidget(TQWidget *parent): ColorWidget(parent)
 {
   TQGridLayout *mGrid = new TQGridLayout(this, 3, 3);
 
@@ -437,7 +437,7 @@ void HSVWidget::slotPatchChanged(const TQColor& clr)
 
 /*          GreyWidget         */
 
-GreyWidget::GreyWidget(TQWidget *tqparent): ColorWidget(tqparent)
+GreyWidget::GreyWidget(TQWidget *parent): ColorWidget(parent)
 {
   TQGridLayout *mGrid = new TQGridLayout(this, 3, 3);
 
@@ -511,7 +511,7 @@ void GreyWidget::slotPatchChanged(const TQColor& clr)
   emit colorChanged(mColor);
 }
 
-LABWidget::LABWidget(TQWidget *tqparent) : ColorWidget(tqparent)
+LABWidget::LABWidget(TQWidget *parent) : ColorWidget(parent)
 {
   TQGridLayout *mGrid = new TQGridLayout(this, 4, 5);
 
diff --git a/lib/kopainter/koColorChooser.h b/lib/kopainter/koColorChooser.h
index c6d721130..4f9484962 100644
--- a/lib/kopainter/koColorChooser.h
+++ b/lib/kopainter/koColorChooser.h
@@ -45,7 +45,7 @@ class KoColorChooser : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoColorChooser(TQWidget *tqparent = 0L, const char *name = 0L);
+  KoColorChooser(TQWidget *parent = 0L, const char *name = 0L);
 
   const KoColor &color() const {return mColor; }
 
@@ -86,7 +86,7 @@ class ColorWidget : public TQWidget {
   TQ_OBJECT
 
 public:
-	ColorWidget(TQWidget *tqparent = 0);
+	ColorWidget(TQWidget *parent = 0);
 	virtual ~ColorWidget();
 
 public slots:
@@ -103,7 +103,7 @@ class RGBWidget : public ColorWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  RGBWidget(TQWidget *tqparent = 0L);
+  RGBWidget(TQWidget *parent = 0L);
   virtual ~RGBWidget() {}
 
 public slots:
@@ -141,7 +141,7 @@ class HSVWidget : public ColorWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  HSVWidget(TQWidget *tqparent = 0L);
+  HSVWidget(TQWidget *parent = 0L);
   virtual ~HSVWidget() {}
 
 public slots:
@@ -179,7 +179,7 @@ class GreyWidget : public ColorWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  GreyWidget(TQWidget *tqparent = 0L);
+  GreyWidget(TQWidget *parent = 0L);
   virtual ~GreyWidget() {}
 
 public slots:
@@ -205,7 +205,7 @@ class LABWidget : public ColorWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  LABWidget(TQWidget *tqparent = 0L);
+  LABWidget(TQWidget *parent = 0L);
   virtual ~LABWidget() {}
 
 public slots:
diff --git a/lib/kopainter/koColorSlider.cc b/lib/kopainter/koColorSlider.cc
index 46f4d2495..6c1f82307 100644
--- a/lib/kopainter/koColorSlider.cc
+++ b/lib/kopainter/koColorSlider.cc
@@ -26,8 +26,8 @@
 #include <kdebug.h>
 #include <kpixmapeffect.h>
 
-KoColorFrame::KoColorFrame(TQWidget *tqparent):
-TQFrame(tqparent)
+KoColorFrame::KoColorFrame(TQWidget *parent):
+TQFrame(parent)
 {
   setFrameStyle(Panel | Sunken);
   setBackgroundMode(NoBackground);
@@ -167,8 +167,8 @@ void KoColorFrame::mouseMoveEvent(TQMouseEvent *e)
 
 /***********************************************************************************/
 
-KoSliderWidget::KoSliderWidget(TQWidget *tqparent):
-TQWidget(tqparent)
+KoSliderWidget::KoSliderWidget(TQWidget *parent):
+TQWidget(parent)
 {
   mDragging = false;
   setFixedHeight(6);
@@ -235,8 +235,8 @@ void KoSliderWidget::mouseMoveEvent(TQMouseEvent *e)
 
 /***********************************************************************************/
 
-KoColorSlider::KoColorSlider(TQWidget *tqparent):
-TQWidget(tqparent)
+KoColorSlider::KoColorSlider(TQWidget *parent):
+TQWidget(parent)
 {
   mColorFrame = new KoColorFrame(this);
   mSlider = new KoSliderWidget(this);
diff --git a/lib/kopainter/koColorSlider.h b/lib/kopainter/koColorSlider.h
index e556bcf28..afd7f7a98 100644
--- a/lib/kopainter/koColorSlider.h
+++ b/lib/kopainter/koColorSlider.h
@@ -33,7 +33,7 @@ class KOPAINTER_EXPORT KoColorFrame : public TQFrame
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoColorFrame(TQWidget *tqparent = 0L);
+  KoColorFrame(TQWidget *parent = 0L);
 
   const TQColor colorAt(const TQPoint &p);
   
@@ -66,7 +66,7 @@ class KOPAINTER_EXPORT KoSliderWidget : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoSliderWidget(TQWidget *tqparent = 0L);
+  KoSliderWidget(TQWidget *parent = 0L);
 
 protected:
   void mousePressEvent(TQMouseEvent *e);
@@ -87,7 +87,7 @@ class KOPAINTER_EXPORT KoColorSlider : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoColorSlider(TQWidget *tqparent = 0L);
+  KoColorSlider(TQWidget *parent = 0L);
   virtual ~KoColorSlider();
 
   int minValue();
diff --git a/lib/kopainter/koFrameButton.cc b/lib/kopainter/koFrameButton.cc
index 806104225..c87fe2309 100644
--- a/lib/kopainter/koFrameButton.cc
+++ b/lib/kopainter/koFrameButton.cc
@@ -20,8 +20,8 @@
 
 #include "koFrameButton.h"
 
-KoFrameButton::KoFrameButton(TQWidget *tqparent, const char *name):
-TQLabel(tqparent, name)
+KoFrameButton::KoFrameButton(TQWidget *parent, const char *name):
+TQLabel(parent, name)
 {
   setAutoResize(true);
   setFrameStyle(Panel | Raised);
@@ -31,8 +31,8 @@ TQLabel(tqparent, name)
   mToggle = false;
 }
 
-KoFrameButton::KoFrameButton(const TQString &text, TQWidget *tqparent, const char *name):
-TQLabel(tqparent, name)
+KoFrameButton::KoFrameButton(const TQString &text, TQWidget *parent, const char *name):
+TQLabel(parent, name)
 {
   setFrameStyle(Panel | Raised);
   setLineWidth(1);
@@ -42,8 +42,8 @@ TQLabel(tqparent, name)
   mToggle = false;
 }
 
-KoFrameButton::KoFrameButton(const TQPixmap &pixmap, TQWidget *tqparent, const char *name):
-TQLabel(tqparent, name)
+KoFrameButton::KoFrameButton(const TQPixmap &pixmap, TQWidget *parent, const char *name):
+TQLabel(parent, name)
 {
   setFrameStyle(Panel | Raised);
   setLineWidth(1);
diff --git a/lib/kopainter/koFrameButton.h b/lib/kopainter/koFrameButton.h
index d05e1d1f7..41f33837b 100644
--- a/lib/kopainter/koFrameButton.h
+++ b/lib/kopainter/koFrameButton.h
@@ -31,9 +31,9 @@ class KoFrameButton : public TQLabel
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoFrameButton(TQWidget *tqparent = 0, const char *name = 0);
-  KoFrameButton(const TQString &text, TQWidget *tqparent = 0, const char *name = 0);
-  KoFrameButton(const TQPixmap &pixmap, TQWidget *tqparent = 0, const char *name = 0);
+  KoFrameButton(TQWidget *parent = 0, const char *name = 0);
+  KoFrameButton(const TQString &text, TQWidget *parent = 0, const char *name = 0);
+  KoFrameButton(const TQPixmap &pixmap, TQWidget *parent = 0, const char *name = 0);
 
   bool isOn() {return mActive; }
   void setOn(bool v);
diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc
index 06efc8cf9..4604bbbd3 100644
--- a/lib/kopainter/koIconChooser.cc
+++ b/lib/kopainter/koIconChooser.cc
@@ -29,8 +29,8 @@
 #include <tqlayout.h>
 #include <kdebug.h>
 
-KoPixmapWidget::KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *tqparent, const char *name):
-TQFrame(tqparent, name, WType_Popup)
+KoPixmapWidget::KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *parent, const char *name):
+TQFrame(parent, name, WType_Popup)
 {
   kdDebug() << "Popup created: " << name << "\n";
   setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
@@ -61,8 +61,8 @@ void KoPixmapWidget::mouseReleaseEvent(TQMouseEvent *)
 }
 
 
-KoIconChooser::KoIconChooser(TQSize aIconSize, TQWidget *tqparent, const char *name, bool sort):
-TQGridView(tqparent, name)
+KoIconChooser::KoIconChooser(TQSize aIconSize, TQWidget *parent, const char *name, bool sort):
+TQGridView(parent, name)
 {
   TQGridView::setBackgroundColor(TQt::white);
 
@@ -431,8 +431,8 @@ int KoIconChooser::sortInsertionIndex(const KoIconItem *item)
   return index;
 }
 
-KoPatternChooser::KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+KoPatternChooser::KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
 {
     // only serves as beautifier for the iconchooser
     //frame = new TQHBox( this );
diff --git a/lib/kopainter/koIconChooser.h b/lib/kopainter/koIconChooser.h
index 59057f2ec..84c15e131 100644
--- a/lib/kopainter/koIconChooser.h
+++ b/lib/kopainter/koIconChooser.h
@@ -48,7 +48,7 @@ public:
 class KoPixmapWidget : public TQFrame
 {
 public:
-  KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *tqparent = 0L, const char *name = 0L);
+  KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *parent = 0L, const char *name = 0L);
   ~KoPixmapWidget();
 
 protected:
@@ -65,7 +65,7 @@ class KOPAINTER_EXPORT KoIconChooser: public TQGridView
   TQ_OBJECT
 public:
   // To make the items sorted, set 'sort' to true and override KoIconItem::compare().
-  KoIconChooser(TQSize iconSize, TQWidget *tqparent = 0L, const char *name = 0L, bool sort = false);
+  KoIconChooser(TQSize iconSize, TQWidget *parent = 0L, const char *name = 0L, bool sort = false);
   virtual ~KoIconChooser();
 
   bool autoDelete() const {return mIconList.autoDelete(); }
@@ -126,7 +126,7 @@ class KOPAINTER_EXPORT KoPatternChooser : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget *tqparent, const char *name = 0 );
+  KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget *parent, const char *name = 0 );
   ~KoPatternChooser();
 
   KoIconItem *currentPattern();
diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cc
index 5dee7ec5a..1eb9eeced 100644
--- a/lib/kopainter/ko_cmyk_widget.cc
+++ b/lib/kopainter/ko_cmyk_widget.cc
@@ -38,7 +38,7 @@
 #include <kcolordialog.h>
 #include <kdualcolorbutton.h>
 
-KoCMYKWidget::KoCMYKWidget(TQWidget *tqparent, const char *name) : super(tqparent, name)
+KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_ColorButton = new KDualColorButton(this);
     m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
diff --git a/lib/kopainter/ko_cmyk_widget.h b/lib/kopainter/ko_cmyk_widget.h
index b65f6645c..bf4ca658f 100644
--- a/lib/kopainter/ko_cmyk_widget.h
+++ b/lib/kopainter/ko_cmyk_widget.h
@@ -48,7 +48,7 @@ class KoCMYKWidget
     typedef TQWidget super;
 
 public:
-    KoCMYKWidget(TQWidget *tqparent = 0L, const char *name = 0);
+    KoCMYKWidget(TQWidget *parent = 0L, const char *name = 0);
     virtual ~KoCMYKWidget() {}
 
 public slots:
diff --git a/lib/kopainter/ko_color_wheel.cc b/lib/kopainter/ko_color_wheel.cc
index 17a93c7ba..0c2688499 100644
--- a/lib/kopainter/ko_color_wheel.cc
+++ b/lib/kopainter/ko_color_wheel.cc
@@ -27,7 +27,7 @@
 
 #define pi 3.14159265
 
-KoColorWheel::KoColorWheel( TQWidget *tqparent, const char *name ): KXYSelector( tqparent, name )
+KoColorWheel::KoColorWheel( TQWidget *parent, const char *name ): KXYSelector( parent, name )
 {
 
 }
diff --git a/lib/kopainter/ko_color_wheel.h b/lib/kopainter/ko_color_wheel.h
index d12fa1bc0..861440b27 100644
--- a/lib/kopainter/ko_color_wheel.h
+++ b/lib/kopainter/ko_color_wheel.h
@@ -32,7 +32,7 @@ class KoColorWheel : public KXYSelector
   TQ_OBJECT
 
 public:
-    KoColorWheel( TQWidget *tqparent=0, const char *name=0 );
+    KoColorWheel( TQWidget *parent=0, const char *name=0 );
 
 signals:
     void valueChanged(const KoColor& c);
diff --git a/lib/kopainter/ko_gray_widget.cc b/lib/kopainter/ko_gray_widget.cc
index bf7503dfc..e40031b5a 100644
--- a/lib/kopainter/ko_gray_widget.cc
+++ b/lib/kopainter/ko_gray_widget.cc
@@ -31,7 +31,7 @@
 #include <koColorSlider.h>
 #include <kcolordialog.h>
 
-KoGrayWidget::KoGrayWidget(TQWidget *tqparent, const char *name) : super(tqparent, name)
+KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_ColorButton = new KDualColorButton(this);
     Q_CHECK_PTR(m_ColorButton);
diff --git a/lib/kopainter/ko_gray_widget.h b/lib/kopainter/ko_gray_widget.h
index 6f950201f..2c008c84e 100644
--- a/lib/kopainter/ko_gray_widget.h
+++ b/lib/kopainter/ko_gray_widget.h
@@ -40,7 +40,7 @@ class KoGrayWidget
     typedef TQWidget super;
 
 public:
-    KoGrayWidget(TQWidget *tqparent = 0L, const char *name = 0);
+    KoGrayWidget(TQWidget *parent = 0L, const char *name = 0);
     virtual ~KoGrayWidget() {}
 
 public slots:
diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc
index 1633fbc8c..c870248a2 100644
--- a/lib/kopainter/ko_hsv_widget.cc
+++ b/lib/kopainter/ko_hsv_widget.cc
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-KoHSVWidget::KoHSVWidget(TQWidget *tqparent, const char *name) : super(tqparent, name)
+KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_ColorButton = new KDualColorButton(this);
     m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
diff --git a/lib/kopainter/ko_hsv_widget.h b/lib/kopainter/ko_hsv_widget.h
index 529e5af2c..c9652fc94 100644
--- a/lib/kopainter/ko_hsv_widget.h
+++ b/lib/kopainter/ko_hsv_widget.h
@@ -43,7 +43,7 @@ class KoHSVWidget
     typedef TQWidget super;
 
 public:
-    KoHSVWidget(TQWidget *tqparent = 0L, const char *name = 0);
+    KoHSVWidget(TQWidget *parent = 0L, const char *name = 0);
     virtual ~KoHSVWidget() {}
 
 public slots:
diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc
index 22df059bf..5eaef38e8 100644
--- a/lib/kopainter/ko_rgb_widget.cc
+++ b/lib/kopainter/ko_rgb_widget.cc
@@ -35,7 +35,7 @@
 #include <koColorSlider.h>
 #include <kcolordialog.h>
 
-KoRGBWidget::KoRGBWidget(TQWidget *tqparent, const char *name) : super(tqparent, name)
+KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_ColorButton = new KDualColorButton(this);
     m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
diff --git a/lib/kopainter/ko_rgb_widget.h b/lib/kopainter/ko_rgb_widget.h
index c7d657a48..b9779513c 100644
--- a/lib/kopainter/ko_rgb_widget.h
+++ b/lib/kopainter/ko_rgb_widget.h
@@ -42,7 +42,7 @@ class KoRGBWidget
     typedef TQWidget super;
 
 public:
-    KoRGBWidget(TQWidget *tqparent = 0L, const char *name = 0);
+    KoRGBWidget(TQWidget *parent = 0L, const char *name = 0);
     virtual ~KoRGBWidget() {}
 
 public slots:
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index 1c6fb9602..c9d6cb2b0 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -39,8 +39,8 @@
 
 #include "kopalette.h"
 
-KoPalette::KoPalette(TQWidget * tqparent, const char * name)
-    : TQDockWindow(tqparent, name)
+KoPalette::KoPalette(TQWidget * parent, const char * name)
+    : TQDockWindow(parent, name)
 {
 
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,90)
diff --git a/lib/kopalette/kopalette.h b/lib/kopalette/kopalette.h
index 6f5654eee..48d9cb3cf 100644
--- a/lib/kopalette/kopalette.h
+++ b/lib/kopalette/kopalette.h
@@ -43,7 +43,7 @@ Q_OBJECT
 
 public:
 
-    KoPalette(TQWidget * tqparent, const char * name);
+    KoPalette(TQWidget * parent, const char * name);
     virtual ~KoPalette();
 
 public:
diff --git a/lib/kopalette/kotabpalette.cc b/lib/kopalette/kotabpalette.cc
index c1b7a8a29..0e7988429 100644
--- a/lib/kopalette/kotabpalette.cc
+++ b/lib/kopalette/kotabpalette.cc
@@ -27,8 +27,8 @@
 #include <kotabpalette.h>
 #include "kopalettemanager.h"
 
-KoTabPalette::KoTabPalette(TQWidget * tqparent, const char * name)
-    : KoPalette(tqparent, name)
+KoTabPalette::KoTabPalette(TQWidget * parent, const char * name)
+    : KoPalette(parent, name)
 {
     m_page = new KTabWidget(this);
     m_page->setTabShape(TQTabWidget::Triangular);
@@ -48,7 +48,7 @@ void KoTabPalette::plug(TQWidget * w, const TQString & /*name*/, int position)
 {
     if (!w) return;
     
-    w -> unsetFont(); // Use the tqparent font
+    w -> unsetFont(); // Use the parent font
 
     m_page -> insertTab(w, w -> caption(), position);
     show();
diff --git a/lib/kopalette/kotabpalette.h b/lib/kopalette/kotabpalette.h
index 18d468064..a33d58a23 100644
--- a/lib/kopalette/kotabpalette.h
+++ b/lib/kopalette/kotabpalette.h
@@ -41,7 +41,7 @@ Q_OBJECT
 
 public:
 
-    KoTabPalette(TQWidget * tqparent, const char * name);
+    KoTabPalette(TQWidget * parent, const char * name);
     virtual ~KoTabPalette();
 
 public:
diff --git a/lib/kopalette/kotoolboxpalette.cc b/lib/kopalette/kotoolboxpalette.cc
index 2ba9f3bb5..e4c2bd630 100644
--- a/lib/kopalette/kotoolboxpalette.cc
+++ b/lib/kopalette/kotoolboxpalette.cc
@@ -24,8 +24,8 @@
 #include <kopalettemanager.h>
 #include <kotoolboxpalette.h>
 
-KoToolBoxPalette::KoToolBoxPalette(TQWidget * tqparent, const char * name)
-    : KoPalette(tqparent, name)
+KoToolBoxPalette::KoToolBoxPalette(TQWidget * parent, const char * name)
+    : KoPalette(parent, name)
 {
     m_page = new TQToolBox(this);
     m_page->unsetFont();
diff --git a/lib/kopalette/kotoolboxpalette.h b/lib/kopalette/kotoolboxpalette.h
index b4c8290f0..1d15ef622 100644
--- a/lib/kopalette/kotoolboxpalette.h
+++ b/lib/kopalette/kotoolboxpalette.h
@@ -34,7 +34,7 @@ Q_OBJECT
 
 public:
 
-    KoToolBoxPalette(TQWidget * tqparent, const char * name);
+    KoToolBoxPalette(TQWidget * parent, const char * name);
     ~KoToolBoxPalette();
 
 public:
diff --git a/lib/koproperty/customproperty.cpp b/lib/koproperty/customproperty.cpp
index f2c178089..c5a33ef6c 100644
--- a/lib/koproperty/customproperty.cpp
+++ b/lib/koproperty/customproperty.cpp
@@ -30,8 +30,8 @@
 
 using namespace KoProperty;
 
-CustomProperty::CustomProperty(Property *tqparent)
- : m_property(tqparent)
+CustomProperty::CustomProperty(Property *parent)
+ : m_property(parent)
 {
 }
 
@@ -80,15 +80,15 @@ SizeCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 	if(!m_property)
 		return;
 
-	if(m_property->tqparent()) {
-		TQSize s = m_property->tqparent()->value().toSize();
+	if(m_property->parent()) {
+		TQSize s = m_property->parent()->value().toSize();
 
 		if(m_property->type() == Size_Height)
 			s.setHeight(value.toInt());
 		else if(m_property->type() == Size_Width)
 			s.setWidth(value.toInt());
 
-		m_property->tqparent()->setValue(s, true, false);
+		m_property->parent()->setValue(s, true, false);
 	}
 	else{
 		TQSize s = value.toSize();
@@ -100,13 +100,13 @@ SizeCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 TQVariant
 SizeCustomProperty::value() const
 {
-	if(!m_property || !m_property->tqparent())
+	if(!m_property || !m_property->parent())
 		return TQVariant();
 
 	if(m_property->type() == Size_Height)
-		return m_property->tqparent()->value().toSize().height();
+		return m_property->parent()->value().toSize().height();
 	else if(m_property->type() == Size_Width)
-		return m_property->tqparent()->value().toSize().width();
+		return m_property->parent()->value().toSize().width();
 
 	return TQVariant();
 }
@@ -146,15 +146,15 @@ PointCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 	if(!m_property)
 		return;
 
-	if(m_property->tqparent()) {
-		TQPoint p = m_property->tqparent()->value().toPoint();
+	if(m_property->parent()) {
+		TQPoint p = m_property->parent()->value().toPoint();
 
 		if(m_property->type() == Point_X)
 			p.setX(value.toInt());
 		else if(m_property->type() == Point_Y)
 			p.setY(value.toInt());
 
-		m_property->tqparent()->setValue(p, true, false);
+		m_property->parent()->setValue(p, true, false);
 	}
 	else {
 		TQPoint p = value.toPoint();
@@ -166,13 +166,13 @@ PointCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 TQVariant
 PointCustomProperty::value() const
 {
-	if(!m_property || !m_property->tqparent())
+	if(!m_property || !m_property->parent())
 		return TQVariant();
 
 	if(m_property->type() == Point_X)
-		return m_property->tqparent()->value().toPoint().x();
+		return m_property->parent()->value().toPoint().x();
 	else if(m_property->type() == Point_Y)
-		return m_property->tqparent()->value().toPoint().y();
+		return m_property->parent()->value().toPoint().y();
 
 	return TQVariant();
 }
@@ -214,8 +214,8 @@ RectCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 	if(!m_property)
 		return;
 
-	if(m_property->tqparent()) {
-		TQRect r = m_property->tqparent()->value().toRect();
+	if(m_property->parent()) {
+		TQRect r = m_property->parent()->value().toRect();
 
 		if(m_property->type() == Rect_X) {
 			//changing x component of Rect shouldn't change width
@@ -234,7 +234,7 @@ RectCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 		else if(m_property->type() == Rect_Height)
 			r.setHeight(value.toInt());
 
-		m_property->tqparent()->setValue(r, true, false);
+		m_property->parent()->setValue(r, true, false);
 	}
 	else {
 		TQRect r = value.toRect();
@@ -248,17 +248,17 @@ RectCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 TQVariant
 RectCustomProperty::value() const
 {
-	if(!m_property || !m_property->tqparent())
+	if(!m_property || !m_property->parent())
 		return TQVariant();
 
 	if(m_property->type() == Rect_X)
-		return m_property->tqparent()->value().toRect().x();
+		return m_property->parent()->value().toRect().x();
 	else if(m_property->type() == Rect_Y)
-		return m_property->tqparent()->value().toRect().y();
+		return m_property->parent()->value().toRect().y();
 	else if(m_property->type() == Rect_Width)
-		return m_property->tqparent()->value().toRect().width();
+		return m_property->parent()->value().toRect().width();
 	else if(m_property->type() == Rect_Height)
-		return m_property->tqparent()->value().toRect().height();
+		return m_property->parent()->value().toRect().height();
 
 	return TQVariant();
 }
@@ -334,8 +334,8 @@ SizePolicyCustomProperty::setValue(const TQVariant &value, bool rememberOldValue
 	if(!m_property)
 		return;
 
-	if(m_property->tqparent()) {
-		TQSizePolicy v = m_property->tqparent()->value().toSizePolicy();
+	if(m_property->parent()) {
+		TQSizePolicy v = m_property->parent()->value().toSizePolicy();
 
 		if(m_property->type() == SizePolicy_HorData)
 			v.setHorData(TQSizePolicy::SizeType(value.toInt()));
@@ -346,7 +346,7 @@ SizePolicyCustomProperty::setValue(const TQVariant &value, bool rememberOldValue
 		else if(m_property->type() == SizePolicy_VerStretch)
 			v.setVerStretch(value.toInt());
 
-		m_property->tqparent()->setValue(v, true, false);
+		m_property->parent()->setValue(v, true, false);
 	}
 	else {
 		TQSizePolicy v = value.toSizePolicy();
@@ -360,17 +360,17 @@ SizePolicyCustomProperty::setValue(const TQVariant &value, bool rememberOldValue
 TQVariant
 SizePolicyCustomProperty::value() const
 {
-	if(!m_property || !m_property->tqparent())
+	if(!m_property || !m_property->parent())
 		return TQVariant();
 
 	if(m_property->type() == SizePolicy_HorData)
-		return m_property->tqparent()->value().toSizePolicy().horData();
+		return m_property->parent()->value().toSizePolicy().horData();
 	else if(m_property->type() == SizePolicy_VerData)
-		return m_property->tqparent()->value().toSizePolicy().verData();
+		return m_property->parent()->value().toSizePolicy().verData();
 	else if(m_property->type() == SizePolicy_HorStretch)
-		return m_property->tqparent()->value().toSizePolicy().horStretch();
+		return m_property->parent()->value().toSizePolicy().horStretch();
 	else if(m_property->type() == SizePolicy_VerStretch)
-		return m_property->tqparent()->value().toSizePolicy().verStretch();
+		return m_property->parent()->value().toSizePolicy().verStretch();
 
 	return TQVariant();
 }
diff --git a/lib/koproperty/customproperty.h b/lib/koproperty/customproperty.h
index 60584ca3e..45107eb3f 100644
--- a/lib/koproperty/customproperty.h
+++ b/lib/koproperty/customproperty.h
@@ -40,20 +40,20 @@ class Property;
 class KOPROPERTY_EXPORT CustomProperty
 {
 	public:
-		CustomProperty(Property *tqparent);
+		CustomProperty(Property *parent);
 		virtual ~CustomProperty();
 
 		/*! This function is called by \ref Property::setValue() when
 		a custom property is set.
 		You don't have to modify the property value, it is done by Property class.
-		You just have to update child or tqparent properties value (m_property->tqparent()->setValue()).
+		You just have to update child or parent properties value (m_property->parent()->setValue()).
 		Note that, when calling Property::setValue, you <b>need</b> to set
 		useCustomProperty (3rd parameter) to false, or there will be infinite recursion. */
 		virtual void setValue(const TQVariant &value, bool rememberOldValue) = 0;
 
 		/*! This function is called by \ref Property::value() when
 		a custom property is set and \ref handleValue() is true.
-		You should return property's value, taken from tqparent's value.*/
+		You should return property's value, taken from parent's value.*/
 		virtual TQVariant value() const = 0;
 
 		/*! Tells whether CustomProperty should be used to get the property's value.
@@ -66,7 +66,7 @@ class KOPROPERTY_EXPORT CustomProperty
 		Property  *m_property;
 
 		/*! This method emits the \a Set::propertyChanged() signal for all
-		sets our tqparent-property is registered in. */
+		sets our parent-property is registered in. */
 		void emitPropertyChanged();
 };
 
@@ -74,7 +74,7 @@ class KOPROPERTY_EXPORT CustomProperty
 class KOPROPERTY_EXPORT SizeCustomProperty : public CustomProperty
 {
 	public:
-		SizeCustomProperty(Property *tqparent);
+		SizeCustomProperty(Property *parent);
 		~SizeCustomProperty();
 
 		void setValue(const TQVariant &value, bool rememberOldValue);
@@ -86,7 +86,7 @@ class KOPROPERTY_EXPORT SizeCustomProperty : public CustomProperty
 class KOPROPERTY_EXPORT PointCustomProperty : public CustomProperty
 {
 	public:
-		PointCustomProperty(Property *tqparent);
+		PointCustomProperty(Property *parent);
 		~PointCustomProperty();
 
 		void setValue(const TQVariant &value, bool rememberOldValue);
@@ -98,7 +98,7 @@ class KOPROPERTY_EXPORT PointCustomProperty : public CustomProperty
 class KOPROPERTY_EXPORT RectCustomProperty : public CustomProperty
 {
 	public:
-		RectCustomProperty(Property *tqparent);
+		RectCustomProperty(Property *parent);
 		~RectCustomProperty();
 
 		void setValue(const TQVariant &value, bool rememberOldValue);
@@ -110,7 +110,7 @@ class KOPROPERTY_EXPORT RectCustomProperty : public CustomProperty
 class KOPROPERTY_EXPORT SizePolicyCustomProperty : public CustomProperty
 {
 	public:
-		SizePolicyCustomProperty(Property *tqparent);
+		SizePolicyCustomProperty(Property *parent);
 		~SizePolicyCustomProperty();
 
 		void setValue(const TQVariant &value, bool rememberOldValue);
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index f15cab20e..7d6c809e6 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -49,14 +49,14 @@ namespace KoProperty {
 //! @internal
 static bool kofficeAppDirAdded = false;
 
-//! \return true if \a o has tqparent \a par.
+//! \return true if \a o has parent \a par.
 //! @internal
 inline bool hasParent(TQObject* par, TQObject* o)
 {
 	if (!o || !par)
 		return false;
 	while (o && o != par)
-		o = o->tqparent();
+		o = o->parent();
 	return o == par;
 }
 
@@ -119,8 +119,8 @@ class EditorPrivate
 
 using namespace KoProperty;
 
-Editor::Editor(TQWidget *tqparent, bool autoSync, const char *name)
- : KListView(tqparent, name)
+Editor::Editor(TQWidget *parent, bool autoSync, const char *name)
+ : KListView(parent, name)
 {
 	d = new EditorPrivate(this);
 	d->itemDict.setAutoDelete(false);
@@ -248,7 +248,7 @@ Editor::fill()
 }
 
 void
-Editor::addItem(const TQCString &name, EditorItem *tqparent)
+Editor::addItem(const TQCString &name, EditorItem *parent)
 {
 	if(!d->set || !d->set->contains(name))
 		return;
@@ -258,13 +258,13 @@ Editor::addItem(const TQCString &name, EditorItem *tqparent)
 //		kopropertydbg << "Property is not visible: " << name << endl;
 		return;
 	}
-	TQListViewItem *last = tqparent ? tqparent->firstChild() : d->topItem->firstChild();
+	TQListViewItem *last = parent ? parent->firstChild() : d->topItem->firstChild();
 	while(last && last->nextSibling())
 		last = last->nextSibling();
 
 	EditorItem *item=0;
-	if(tqparent)
-		item = new EditorItem(this, tqparent, property, last);
+	if(parent)
+		item = new EditorItem(this, parent, property, last);
 	else
 		item = new EditorItem(this, d->topItem, property, last);
 	d->itemDict.insert(name, item);
@@ -456,8 +456,8 @@ Editor::slotPropertyChanged(Set& set, Property& property)
 	else  {
 		// prop not in the dict, might be a child property:
 		EditorItem *item = d->itemDict[property.name()];
-		if(!item && property.tqparent())
-			item = d->itemDict[property.tqparent()->name()];
+		if(!item && property.parent())
+			item = d->itemDict[property.parent()->name()];
 		if (item) {
 			repaintItem(item);
 			for(TQListViewItem *it = item->firstChild(); it; it = it->nextSibling())
@@ -467,14 +467,14 @@ Editor::slotPropertyChanged(Set& set, Property& property)
 
 //! @todo should we move this somewhere?
 #if 0
-	if (property.tqparent() && property.tqparent()->type()==Rect) {
+	if (property.parent() && property.parent()->type()==Rect) {
 		const int delta = property.value().toInt()-previousValue.toInt();
 		if (property.type()==Rect_X) { //|| property.type()==Rect_Y)
-			property.tqparent()->child("width")->setValue(delta, false);
+			property.parent()->child("width")->setValue(delta, false);
 		}
 
-/*	if (widget->property() && (TQWidget*)d->currentWidget==widget && d->currentItem->tqparent()) {
-		EditorItem *parentItem = static_cast<EditorItem*>(d->currentItem->tqparent());
+/*	if (widget->property() && (TQWidget*)d->currentWidget==widget && d->currentItem->parent()) {
+		EditorItem *parentItem = static_cast<EditorItem*>(d->currentItem->parent());
 		const int thisType = ;
 			&& parentItem->property()->type()==Rect) {
 			//changing x or y components of Rect type shouldn't change width or height, respectively
@@ -504,8 +504,8 @@ Editor::slotPropertyReset(Set& set, Property& property)
 	else  {
 		EditorItem *item = d->itemDict[property.name()];
 		// prop not in the dict, might be a child prop.
-		if(!item && property.tqparent())
-			item = d->itemDict[property.tqparent()->name()];
+		if(!item && property.parent())
+			item = d->itemDict[property.parent()->name()];
 		if (item) {
 			repaintItem(item);
 			for(TQListViewItem *it = item->firstChild(); it; it = it->nextSibling())
@@ -801,8 +801,8 @@ Editor::slotCollapsed(TQListViewItem *item)
 		return;
 	//unselect child item and hide editor if a group item has been collapsed
 	if (dynamic_cast<EditorGroupItem*>(item)) {
-		for (TQListViewItem *i = selectedItem(); i; i = i->tqparent()) {
-			if (i->tqparent()==item) {
+		for (TQListViewItem *i = selectedItem(); i; i = i->parent()) {
+			if (i->parent()==item) {
 				d->previouslyCollapsedGroupItem = item;
 				d->childFormPreviouslyCollapsedGroupItem = selectedItem();
 				hideEditor();
diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h
index 677208de6..c3ab0c2e8 100644
--- a/lib/koproperty/editor.h
+++ b/lib/koproperty/editor.h
@@ -66,14 +66,14 @@ class KOPROPERTY_EXPORT Editor : public KListView
   TQ_OBJECT
 
 	public:
-		/*! Creates an empty Editor with \a tqparent as tqparent widget.
+		/*! Creates an empty Editor with \a parent as parent widget.
 		If \a autoSync == true, properties values are automatically synced as
 		soon as editor contents change (eg the user types text, etc.)
 		and the values are written in the property set. Otherwise, property set
 		is updated only when selected item changes or user presses Enter key.
 		Each property can overwrite this if its autoSync() == 0 or 1.
 		*/
-		Editor(TQWidget *tqparent=0, bool autoSync=true, const char *name=0);
+		Editor(TQWidget *parent=0, bool autoSync=true, const char *name=0);
 
 		virtual ~Editor();
 
@@ -160,7 +160,7 @@ class KOPROPERTY_EXPORT Editor : public KListView
 		void clearWidgetCache();
 
 		void fill();
-		void addItem(const TQCString &name, EditorItem *tqparent);
+		void addItem(const TQCString &name, EditorItem *parent);
 
 		void showUndoButton( bool show );
 
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index 1c0e1b727..653cbe0ab 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -93,8 +93,8 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T
 class GroupWidgetBase : public TQWidget
 {
 	public:
-		GroupWidgetBase(TQWidget* tqparent)
-		: TQWidget(tqparent)
+		GroupWidgetBase(TQWidget* parent)
+		: TQWidget(parent)
 		, m_isOpen(true)
 		, m_mouseDown(false)
 		{
@@ -204,8 +204,8 @@ class GroupContainer::Private
 
 using namespace KoProperty;
 
-GroupContainer::GroupContainer(const TQString& title, TQWidget* tqparent)
-: TQWidget(tqparent)
+GroupContainer::GroupContainer(const TQString& title, TQWidget* parent)
+: TQWidget(parent)
 , d(new Private())
 {
 	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1));
@@ -254,8 +254,8 @@ bool GroupContainer::event( TQEvent * e ) {
 
 //////////////////////////////////////////////////////
 
-EditorItem::EditorItem(Editor *editor, EditorItem *tqparent, Property *property, TQListViewItem *after)
- : KListViewItem(tqparent, after,
+EditorItem::EditorItem(Editor *editor, EditorItem *parent, Property *property, TQListViewItem *after)
+ : KListViewItem(parent, after,
 	property->captionForDisplaying().isEmpty() ? property->name() : property->captionForDisplaying())
 {
 	d = new EditorItemPrivate();
@@ -280,8 +280,8 @@ EditorItem::EditorItem(Editor *editor, EditorItem *tqparent, Property *property,
 */
 }
 
-EditorItem::EditorItem(KListView *tqparent)
- : KListViewItem(tqparent)
+EditorItem::EditorItem(KListView *parent)
+ : KListViewItem(parent)
 {
 	d = new EditorItemPrivate();
 	d->property = 0;
@@ -289,8 +289,8 @@ EditorItem::EditorItem(KListView *tqparent)
 	setMultiLinesEnabled(true);
 }
 
-EditorItem::EditorItem(EditorItem *tqparent, const TQString &text)
- : KListViewItem(tqparent, text)
+EditorItem::EditorItem(EditorItem *parent, const TQString &text)
+ : KListViewItem(parent, text)
 {
 	d = new EditorItemPrivate();
 	d->property = 0;
@@ -298,8 +298,8 @@ EditorItem::EditorItem(EditorItem *tqparent, const TQString &text)
 	setMultiLinesEnabled(true);
 }
 
-EditorItem::EditorItem(EditorItem *tqparent, EditorItem *after, const TQString &text)
- : KListViewItem(tqparent, after, text)
+EditorItem::EditorItem(EditorItem *parent, EditorItem *after, const TQString &text)
+ : KListViewItem(parent, after, text)
 {
 	d = new EditorItemPrivate();
 	d->property = 0;
@@ -334,18 +334,18 @@ EditorItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int wid
 		p->setBrush(cg.highlight());
 		p->setPen(cg.highlightedText());
 		KListViewItem::paintCell(p, cg, column, width, align);
-		p->fillRect(tqparent() ? 0 : 50, 0, width, height()-1,
+		p->fillRect(parent() ? 0 : 50, 0, width, height()-1,
 			TQBrush(isSelected() ? cg.highlight() : backgroundColor()));
 		p->setPen(isSelected() ? cg.highlightedText() : cg.text());
 		int delta = -20+KPROPEDITOR_ITEM_MARGIN;
-		if ((firstChild() && dynamic_cast<EditorGroupItem*>(tqparent()))) {
+		if ((firstChild() && dynamic_cast<EditorGroupItem*>(parent()))) {
 			delta = -KPROPEDITOR_ITEM_MARGIN-1;
 		}
-		if (dynamic_cast<EditorDummyItem*>(tqparent())) {
+		if (dynamic_cast<EditorDummyItem*>(parent())) {
 			delta = KPROPEDITOR_ITEM_MARGIN*2;
 		}
-		else if (tqparent() && dynamic_cast<EditorDummyItem*>(tqparent()->tqparent())) {
-			if (dynamic_cast<EditorGroupItem*>(tqparent()))
+		else if (parent() && dynamic_cast<EditorDummyItem*>(parent()->parent())) {
+			if (dynamic_cast<EditorGroupItem*>(parent()))
 				delta += KPROPEDITOR_ITEM_MARGIN*2;
 			else
 				delta += KPROPEDITOR_ITEM_MARGIN*5;
@@ -359,7 +359,7 @@ EditorItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int wid
 		p->drawLine(0, -1, width-1, -1);
 
 		p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR ); //! \todo custom color?
-		if (dynamic_cast<EditorDummyItem*>(tqparent()))
+		if (dynamic_cast<EditorDummyItem*>(parent()))
 			p->drawLine(0, 0, 0, height()-1 );
 	}
 	else if(column == 1)
@@ -408,21 +408,21 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in
 		int delta = 0;
 		int fillWidth = w;
 		int x = 0;
-		if (dynamic_cast<EditorGroupItem*>(item->tqparent())) {
+		if (dynamic_cast<EditorGroupItem*>(item->parent())) {
 			delta = 0;//-19;
 			fillWidth += 19;
 		}
 		else {
-			if (dynamic_cast<EditorGroupItem*>(item) || /*for flat mode*/ dynamic_cast<EditorDummyItem*>(item->tqparent()))
+			if (dynamic_cast<EditorGroupItem*>(item) || /*for flat mode*/ dynamic_cast<EditorDummyItem*>(item->parent()))
 				x = 19;
 			else
 				x = -19;
 			fillWidth += 19;
 		}
-		if (dynamic_cast<EditorDummyItem*>(item->tqparent())) {
+		if (dynamic_cast<EditorDummyItem*>(item->parent())) {
 			x = 19;
 		}
-		else if (item->tqparent() && dynamic_cast<EditorDummyItem*>(item->tqparent()->tqparent())) {
+		else if (item->parent() && dynamic_cast<EditorDummyItem*>(item->parent()->parent())) {
 			x = 0;
 		}
 		p->fillRect(x+1, 0, fillWidth-1, item->height()-1, TQBrush(backgroundColor));
@@ -434,7 +434,7 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in
 //	for (int i=0; i<10000000; i++)
 //		;
 //		if(item->isSelected())  {
-//			p->fillRect(tqparent() ? 0 : 50, 0, w, item->height()-1, TQBrush(cg.highlight()));
+//			p->fillRect(parent() ? 0 : 50, 0, w, item->height()-1, TQBrush(cg.highlight()));
 //			p->fillRect(-50,0,50, item->height(), TQBrush(cg.highlight()));
 //		}
 
@@ -443,20 +443,20 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in
 			|| (static_cast<EditorItem*>(item)->property() && static_cast<EditorItem*>(item)->property()->isModified()) );
 		p->setFont(font);
 		p->setPen(item->isSelected() ? cg.highlightedText() : cg.text());
-		if (item->firstChild() && dynamic_cast<EditorGroupItem*>(item->tqparent())) {
+		if (item->firstChild() && dynamic_cast<EditorGroupItem*>(item->parent())) {
 			delta = 19-KPROPEDITOR_ITEM_MARGIN-1;
 		}
-		else if (dynamic_cast<EditorDummyItem*>(item->tqparent())) {
+		else if (dynamic_cast<EditorDummyItem*>(item->parent())) {
 			delta = 19;
 		}
-		if (item->tqparent() && dynamic_cast<EditorDummyItem*>(item->tqparent()->tqparent())) {
-			if (dynamic_cast<EditorGroupItem*>(item->tqparent()))
+		if (item->parent() && dynamic_cast<EditorDummyItem*>(item->parent()->parent())) {
+			if (dynamic_cast<EditorGroupItem*>(item->parent()))
 				delta += KPROPEDITOR_ITEM_MARGIN*2;
 			else
 				delta += KPROPEDITOR_ITEM_MARGIN*5;
 		}
 
-		if (!dynamic_cast<EditorDummyItem*>(item->tqparent()))
+		if (!dynamic_cast<EditorDummyItem*>(item->parent()))
 			p->drawText(TQRect(delta+1,0, w+listView()->columnWidth(1), item->height()),
 			TQt::AlignLeft | TQt::AlignVCenter /*| TQt::SingleLine*/, item->text(0));
 
@@ -512,16 +512,16 @@ EditorItem::setHeight( int height )
 
 //////////////////////////////////////////////////////
 
-EditorGroupItem::EditorGroupItem(EditorItem *tqparent, EditorItem *after, const TQString &text, const TQString &icon, int sortOrder)
- : EditorItem(tqparent, after, text)
+EditorGroupItem::EditorGroupItem(EditorItem *parent, EditorItem *after, const TQString &text, const TQString &icon, int sortOrder)
+ : EditorItem(parent, after, text)
  , m_label(0)
  , m_sortOrder(sortOrder)
 {
 	init(icon);
 }
 
-EditorGroupItem::EditorGroupItem(EditorItem *tqparent, const TQString &text, const TQString &icon, int sortOrder)
- : EditorItem(tqparent, text)
+EditorGroupItem::EditorGroupItem(EditorItem *parent, const TQString &text, const TQString &icon, int sortOrder)
+ : EditorItem(parent, text)
  , m_label(0)
  , m_sortOrder(sortOrder)
 {
diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h
index a3993d861..9f2c75c29 100644
--- a/lib/koproperty/editoritem.h
+++ b/lib/koproperty/editoritem.h
@@ -49,16 +49,16 @@ class EditorItem : public KListViewItem
 	public:
 		typedef TQAsciiDict<EditorItem> Dict;
 
-		/*! Creates an EditorItem child of \a tqparent, associated to \a property.
+		/*! Creates an EditorItem child of \a parent, associated to \a property.
 		 It \a property has not desctiption set, its name (i.e. not i18n'ed) is reused.
 		*/
-		EditorItem(Editor *editor, EditorItem *tqparent, Property *property,
+		EditorItem(Editor *editor, EditorItem *parent, Property *property,
 			TQListViewItem *after=0);
 
 		//! Two helper contructors for subclass
-		EditorItem(KListView *tqparent);
-		EditorItem(EditorItem *tqparent, const TQString &text);
-		EditorItem(EditorItem *tqparent, EditorItem *after, const TQString &text);
+		EditorItem(KListView *parent);
+		EditorItem(EditorItem *parent, const TQString &text);
+		EditorItem(EditorItem *parent, EditorItem *after, const TQString &text);
 
 		virtual ~EditorItem();
 
@@ -90,9 +90,9 @@ class EditorItem : public KListViewItem
 class EditorGroupItem : public EditorItem
 {
 	public:
-		EditorGroupItem(EditorItem *tqparent, EditorItem *after, const TQString &text, 
+		EditorGroupItem(EditorItem *parent, EditorItem *after, const TQString &text, 
 			const TQString &icon, int sortOrder);
-		EditorGroupItem(EditorItem *tqparent, const TQString &text, 
+		EditorGroupItem(EditorItem *parent, const TQString &text, 
 			const TQString &icon, int sortOrder);
 		virtual ~EditorGroupItem();
 
@@ -115,7 +115,7 @@ class EditorGroupItem : public EditorItem
 class EditorDummyItem : public EditorItem
 {
 	public:
-		EditorDummyItem(KListView *tqparent);
+		EditorDummyItem(KListView *parent);
 		virtual ~EditorDummyItem();
 
 	protected:
diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp
index 5c347c02f..886f20d86 100644
--- a/lib/koproperty/editors/booledit.cpp
+++ b/lib/koproperty/editors/booledit.cpp
@@ -35,8 +35,8 @@
 
 using namespace KoProperty;
 
-BoolEdit::BoolEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
  , m_yesIcon( SmallIcon("button_ok") )
  , m_noIcon( SmallIcon("button_no") )
 {
@@ -150,8 +150,8 @@ BoolEdit::setReadOnlyInternal(bool readOnly)
 
 //--------------------------------------------------
 
-ThreeStateBoolEdit::ThreeStateBoolEdit(Property *property, TQWidget *tqparent, const char *name)
- : ComboBox(property, tqparent, name)
+ThreeStateBoolEdit::ThreeStateBoolEdit(Property *property, TQWidget *parent, const char *name)
+ : ComboBox(property, parent, name)
  , m_yesIcon( SmallIcon("button_ok") )
  , m_noIcon( SmallIcon("button_no") )
 {
diff --git a/lib/koproperty/editors/booledit.h b/lib/koproperty/editors/booledit.h
index 0cfbf48e5..f93e4daa1 100644
--- a/lib/koproperty/editors/booledit.h
+++ b/lib/koproperty/editors/booledit.h
@@ -36,7 +36,7 @@ class KOPROPERTY_EXPORT BoolEdit : public Widget
   TQ_OBJECT
 
 	public:
-		BoolEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		BoolEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~BoolEdit();
 
 		virtual TQVariant value() const;
@@ -63,7 +63,7 @@ class KOPROPERTY_EXPORT ThreeStateBoolEdit : public ComboBox
   TQ_OBJECT
 
 	public:
-		ThreeStateBoolEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		ThreeStateBoolEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~ThreeStateBoolEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp
index d85046867..a9ab1f1a1 100644
--- a/lib/koproperty/editors/coloredit.cpp
+++ b/lib/koproperty/editors/coloredit.cpp
@@ -29,8 +29,8 @@
 
 using namespace KoProperty;
 
-ColorButton::ColorButton(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new KColorCombo(this);
diff --git a/lib/koproperty/editors/coloredit.h b/lib/koproperty/editors/coloredit.h
index d869dc007..000e6e825 100644
--- a/lib/koproperty/editors/coloredit.h
+++ b/lib/koproperty/editors/coloredit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT ColorButton : public Widget
   TQ_OBJECT
 
 	public:
-		ColorButton(Property *property, TQWidget *tqparent=0, const char *name=0);
+		ColorButton(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~ColorButton();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp
index 661aa1e02..343a9ed9b 100644
--- a/lib/koproperty/editors/combobox.cpp
+++ b/lib/koproperty/editors/combobox.cpp
@@ -31,8 +31,8 @@
 
 using namespace KoProperty;
 
-ComboBox::ComboBox(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+ComboBox::ComboBox(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
  , m_setValueEnabled(true)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
diff --git a/lib/koproperty/editors/combobox.h b/lib/koproperty/editors/combobox.h
index dda5d067c..709d07d6e 100644
--- a/lib/koproperty/editors/combobox.h
+++ b/lib/koproperty/editors/combobox.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT ComboBox : public Widget
   TQ_OBJECT
 
 	public:
-		ComboBox(Property *property, TQWidget *tqparent=0, const char *name=0);
+		ComboBox(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~ComboBox();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp
index efcc0e442..61d444996 100644
--- a/lib/koproperty/editors/cursoredit.cpp
+++ b/lib/koproperty/editors/cursoredit.cpp
@@ -35,8 +35,8 @@ using namespace KoProperty;
 Property::ListData *m_cursorListData = 0;
 
 
-CursorEdit::CursorEdit(Property *property, TQWidget *tqparent, const char *name)
-: ComboBox(property, tqparent, name)
+CursorEdit::CursorEdit(Property *property, TQWidget *parent, const char *name)
+: ComboBox(property, parent, name)
 {
 	/*
 	if(!m_spValues) {
diff --git a/lib/koproperty/editors/cursoredit.h b/lib/koproperty/editors/cursoredit.h
index 850653df1..c6c76e0e2 100644
--- a/lib/koproperty/editors/cursoredit.h
+++ b/lib/koproperty/editors/cursoredit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT CursorEdit : public ComboBox
   TQ_OBJECT
 
 	public:
-		CursorEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		CursorEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~CursorEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp
index b72fd7ce2..0df8532a9 100644
--- a/lib/koproperty/editors/dateedit.cpp
+++ b/lib/koproperty/editors/dateedit.cpp
@@ -32,8 +32,8 @@
 
 using namespace KoProperty;
 
-DateEdit::DateEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+DateEdit::DateEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQDateEdit(this);
diff --git a/lib/koproperty/editors/dateedit.h b/lib/koproperty/editors/dateedit.h
index f36e7b655..dde21f0ce 100644
--- a/lib/koproperty/editors/dateedit.h
+++ b/lib/koproperty/editors/dateedit.h
@@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT DateEdit : public Widget
   TQ_OBJECT
 
 	public:
-		DateEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		DateEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~DateEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp
index 7f88cb146..6e12641ab 100644
--- a/lib/koproperty/editors/datetimeedit.cpp
+++ b/lib/koproperty/editors/datetimeedit.cpp
@@ -32,8 +32,8 @@
 
 using namespace KoProperty;
 
-DateTimeEdit::DateTimeEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+DateTimeEdit::DateTimeEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQDateTimeEdit(this);
diff --git a/lib/koproperty/editors/datetimeedit.h b/lib/koproperty/editors/datetimeedit.h
index b8745b013..1ee321b9e 100644
--- a/lib/koproperty/editors/datetimeedit.h
+++ b/lib/koproperty/editors/datetimeedit.h
@@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT DateTimeEdit : public Widget
   TQ_OBJECT
 
 	public:
-		DateTimeEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		DateTimeEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~DateTimeEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/dummywidget.cpp b/lib/koproperty/editors/dummywidget.cpp
index e9fbe3c90..71c3c74ef 100644
--- a/lib/koproperty/editors/dummywidget.cpp
+++ b/lib/koproperty/editors/dummywidget.cpp
@@ -24,8 +24,8 @@
 
 using namespace KoProperty;
 
-DummyWidget::DummyWidget(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+DummyWidget::DummyWidget(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {}
 
 DummyWidget::~DummyWidget()
diff --git a/lib/koproperty/editors/dummywidget.h b/lib/koproperty/editors/dummywidget.h
index ef90ba8f0..b06c571ad 100644
--- a/lib/koproperty/editors/dummywidget.h
+++ b/lib/koproperty/editors/dummywidget.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT DummyWidget: public Widget
   TQ_OBJECT
 
 	public:
-		DummyWidget(Property *property, TQWidget *tqparent=0, const char *name=0);
+		DummyWidget(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~DummyWidget();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp
index 65ae80cf0..0f3d438c9 100644
--- a/lib/koproperty/editors/fontedit.cpp
+++ b/lib/koproperty/editors/fontedit.cpp
@@ -44,8 +44,8 @@ namespace KoProperty {
 class FontEditRequester : public KFontRequester
 {
 	public:
-		FontEditRequester(TQWidget* tqparent)
-			: KFontRequester(tqparent)
+		FontEditRequester(TQWidget* parent)
+			: KFontRequester(parent)
 		{
 			label()->setPaletteBackgroundColor(tqpalette().active().base());
 			label()->setMinimumWidth(0);
@@ -79,8 +79,8 @@ class FontEditRequester : public KFontRequester
 
 using namespace KoProperty;
 
-FontEdit::FontEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+FontEdit::FontEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	m_edit = new FontEditRequester(this);
 	m_edit->setMinimumHeight(5);
diff --git a/lib/koproperty/editors/fontedit.h b/lib/koproperty/editors/fontedit.h
index 6c3a46a47..091fafd02 100644
--- a/lib/koproperty/editors/fontedit.h
+++ b/lib/koproperty/editors/fontedit.h
@@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT FontEdit : public Widget
   TQ_OBJECT
 
 	public:
-		FontEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		FontEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~FontEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/linestyledit.cpp b/lib/koproperty/editors/linestyledit.cpp
index 91783e207..e7f5b2f86 100644
--- a/lib/koproperty/editors/linestyledit.cpp
+++ b/lib/koproperty/editors/linestyledit.cpp
@@ -135,8 +135,8 @@ using namespace KoProperty;
     "................................................"};
 
 
-LineStyleEdit::LineStyleEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+LineStyleEdit::LineStyleEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQComboBox(this);
diff --git a/lib/koproperty/editors/linestyleedit.h b/lib/koproperty/editors/linestyleedit.h
index 8388b897b..d5d386b50 100644
--- a/lib/koproperty/editors/linestyleedit.h
+++ b/lib/koproperty/editors/linestyleedit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT LineStyleEdit : public Widget
   TQ_OBJECT
 
 	public:
-		LineStyleEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		LineStyleEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~LineStyleEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index edc19c80d..92ab746db 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -51,8 +51,8 @@
 
 using namespace KoProperty;
 
-PixmapEdit::PixmapEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 
diff --git a/lib/koproperty/editors/pixmapedit.h b/lib/koproperty/editors/pixmapedit.h
index 61f75fba8..3b6a6cd5b 100644
--- a/lib/koproperty/editors/pixmapedit.h
+++ b/lib/koproperty/editors/pixmapedit.h
@@ -37,7 +37,7 @@ class KOPROPERTY_EXPORT PixmapEdit : public Widget
   TQ_OBJECT
 
 	public:
-		PixmapEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		PixmapEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~PixmapEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp
index d251e969f..6983dd682 100644
--- a/lib/koproperty/editors/pointedit.cpp
+++ b/lib/koproperty/editors/pointedit.cpp
@@ -34,8 +34,8 @@
 
 using namespace KoProperty;
 
-PointEdit::PointEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 	m_edit = new KActiveLabel(this);
diff --git a/lib/koproperty/editors/pointedit.h b/lib/koproperty/editors/pointedit.h
index 22c9a36a9..ce7fc423a 100644
--- a/lib/koproperty/editors/pointedit.h
+++ b/lib/koproperty/editors/pointedit.h
@@ -35,7 +35,7 @@ class KOPROPERTY_EXPORT PointEdit : public Widget
   TQ_OBJECT
 
 	public:
-		PointEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		PointEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~PointEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp
index 313e4e538..ba6fec49b 100644
--- a/lib/koproperty/editors/rectedit.cpp
+++ b/lib/koproperty/editors/rectedit.cpp
@@ -33,8 +33,8 @@
 
 using namespace KoProperty;
 
-RectEdit::RectEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+RectEdit::RectEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 	m_edit = new KActiveLabel(this);
diff --git a/lib/koproperty/editors/rectedit.h b/lib/koproperty/editors/rectedit.h
index 261bf7d5a..5ab25408c 100644
--- a/lib/koproperty/editors/rectedit.h
+++ b/lib/koproperty/editors/rectedit.h
@@ -35,7 +35,7 @@ class KOPROPERTY_EXPORT RectEdit : public Widget
   TQ_OBJECT
 
 	public:
-		RectEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		RectEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~RectEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index db8fb44fa..05422119b 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -34,8 +34,8 @@
 
 using namespace KoProperty;
 
-SizeEdit::SizeEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 	m_edit = new KActiveLabel(this);
diff --git a/lib/koproperty/editors/sizeedit.h b/lib/koproperty/editors/sizeedit.h
index 743f630fc..87b1c2dd7 100644
--- a/lib/koproperty/editors/sizeedit.h
+++ b/lib/koproperty/editors/sizeedit.h
@@ -35,7 +35,7 @@ class KOPROPERTY_EXPORT SizeEdit : public Widget
   TQ_OBJECT
 
 	public:
-		SizeEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		SizeEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~SizeEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp
index 0c616665b..125e0a26f 100644
--- a/lib/koproperty/editors/sizepolicyedit.cpp
+++ b/lib/koproperty/editors/sizepolicyedit.cpp
@@ -34,8 +34,8 @@ using namespace KoProperty;
 
 TQMap<TQString, TQVariant> *SizePolicyEdit::m_spValues = 0;
 
-SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 //	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
diff --git a/lib/koproperty/editors/sizepolicyedit.h b/lib/koproperty/editors/sizepolicyedit.h
index 81ffab402..a33ef731c 100644
--- a/lib/koproperty/editors/sizepolicyedit.h
+++ b/lib/koproperty/editors/sizepolicyedit.h
@@ -37,7 +37,7 @@ class KOPROPERTY_EXPORT SizePolicyEdit : public Widget
   TQ_OBJECT
 
 	public:
-		SizePolicyEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		SizePolicyEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~SizePolicyEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index 8ae4e30a7..8e890419b 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -33,8 +33,8 @@
 
 using namespace KoProperty;
 
-IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntEdit *tqparent, const char *name)
-: KIntSpinBox(lower, upper, step, value, base, tqparent, name)
+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()->tqsetAlignment(TQt::AlignLeft);
 	installEventFilter(editor());
@@ -71,7 +71,7 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e)
 			}
 		}
 	}
-	if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->tqparent()) == TQT_BASE_OBJECT(this)) 
+	if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this)) 
 		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly())
 	{
 		return true; //avoid value changes for read-only widget
@@ -83,8 +83,8 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-IntEdit::IntEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+IntEdit::IntEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQVariant minVal( property ? property->option("min") : 0 );
 	TQVariant maxVal( property ? property->option("max") : TQVariant() );
@@ -176,8 +176,8 @@ IntEdit::setReadOnlyInternal(bool readOnly)
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *tqparent)
-: KDoubleSpinBox(lower, upper, step, value, precision, tqparent)
+DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *parent)
+: KDoubleSpinBox(lower, upper, step, value, precision, parent)
 {
 	editor()->tqsetAlignment(TQt::AlignLeft);
 	installEventFilter(editor());
@@ -204,7 +204,7 @@ DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e)
 			}
 		}
 	}
-	if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->tqparent()) == TQT_BASE_OBJECT(this)) 
+	if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this)) 
 		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly())
 	{
 		return true; //avoid value changes for read-only widget
@@ -226,8 +226,8 @@ void DoubleSpinBox::setValue( const TQVariant& value )
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-DoubleEdit::DoubleEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+DoubleEdit::DoubleEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQVariant minVal( property ? property->option("min") : 0 );
 	TQVariant maxVal( property ? property->option("max") : TQVariant() );
diff --git a/lib/koproperty/editors/spinbox.h b/lib/koproperty/editors/spinbox.h
index d16cc3e90..668b7b2b9 100644
--- a/lib/koproperty/editors/spinbox.h
+++ b/lib/koproperty/editors/spinbox.h
@@ -39,7 +39,7 @@ class IntSpinBox : public KIntSpinBox
 
 	public:
 		IntSpinBox(int lower, int upper, int step, int value, int base=10, 
-			IntEdit *tqparent=0, const char *name=0);
+			IntEdit *parent=0, const char *name=0);
 		virtual ~IntSpinBox() {;}
 
 		virtual void setValue(const TQVariant &value);
@@ -54,7 +54,7 @@ class KOPROPERTY_EXPORT IntEdit : public Widget
 	TQ_OBJECT
 
 	public:
-		IntEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		IntEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~IntEdit();
 
 		virtual TQVariant value() const;
@@ -82,7 +82,7 @@ class DoubleSpinBox : public KDoubleSpinBox
 	public:
 		//! \todo Support setting precision limits, step, etc.
 		DoubleSpinBox(double lower, double upper, double step, double value=0, 
-			int precision=2, DoubleEdit *tqparent=0);
+			int precision=2, DoubleEdit *parent=0);
 		virtual ~DoubleSpinBox() {;}
 
 		virtual bool eventFilter(TQObject *o, TQEvent *e);
@@ -98,7 +98,7 @@ class KOPROPERTY_EXPORT DoubleEdit : public Widget
 	TQ_OBJECT
 
 	public:
-		DoubleEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		DoubleEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~DoubleEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/stringedit.cpp b/lib/koproperty/editors/stringedit.cpp
index d878efa11..55d8b3ed4 100644
--- a/lib/koproperty/editors/stringedit.cpp
+++ b/lib/koproperty/editors/stringedit.cpp
@@ -26,8 +26,8 @@
 
 using namespace KoProperty;
 
-StringEdit::StringEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+StringEdit::StringEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQLineEdit(this);
diff --git a/lib/koproperty/editors/stringedit.h b/lib/koproperty/editors/stringedit.h
index fff366092..1e5e3c5c1 100644
--- a/lib/koproperty/editors/stringedit.h
+++ b/lib/koproperty/editors/stringedit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT StringEdit : public Widget
   TQ_OBJECT
 
 	public:
-		StringEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		StringEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~StringEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp
index eb4dd6598..56bf1145c 100644
--- a/lib/koproperty/editors/stringlistedit.cpp
+++ b/lib/koproperty/editors/stringlistedit.cpp
@@ -37,8 +37,8 @@
 
 using namespace KoProperty;
 
-StringListEdit::StringListEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+StringListEdit::StringListEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
diff --git a/lib/koproperty/editors/stringlistedit.h b/lib/koproperty/editors/stringlistedit.h
index 846e2362c..994b186b2 100644
--- a/lib/koproperty/editors/stringlistedit.h
+++ b/lib/koproperty/editors/stringlistedit.h
@@ -36,7 +36,7 @@ class KOPROPERTY_EXPORT StringListEdit : public Widget
   TQ_OBJECT
 
 	public:
-		StringListEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		StringListEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~StringListEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp
index 289badbbd..53394d54f 100644
--- a/lib/koproperty/editors/symbolcombo.cpp
+++ b/lib/koproperty/editors/symbolcombo.cpp
@@ -32,8 +32,8 @@
 
 using namespace KoProperty;
 
-SymbolCombo::SymbolCombo(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+SymbolCombo::SymbolCombo(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 	TQHBoxLayout *l = new TQHBoxLayout(this);
diff --git a/lib/koproperty/editors/symbolcombo.h b/lib/koproperty/editors/symbolcombo.h
index 7f3e89e18..50ffcf968 100644
--- a/lib/koproperty/editors/symbolcombo.h
+++ b/lib/koproperty/editors/symbolcombo.h
@@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT SymbolCombo : public Widget
   TQ_OBJECT
 
 	public:
-		SymbolCombo(Property *property, TQWidget *tqparent=0, const char *name=0);
+		SymbolCombo(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~SymbolCombo();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp
index 25972f0bd..674d2c89c 100644
--- a/lib/koproperty/editors/timeedit.cpp
+++ b/lib/koproperty/editors/timeedit.cpp
@@ -33,8 +33,8 @@
 
 using namespace KoProperty;
 
-TimeEdit::TimeEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+TimeEdit::TimeEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQTimeEdit(this);
diff --git a/lib/koproperty/editors/timeedit.h b/lib/koproperty/editors/timeedit.h
index 1dbec46b1..642f41017 100644
--- a/lib/koproperty/editors/timeedit.h
+++ b/lib/koproperty/editors/timeedit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT TimeEdit : public Widget
   TQ_OBJECT
 
 	public:
-		TimeEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		TimeEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~TimeEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/urledit.cpp b/lib/koproperty/editors/urledit.cpp
index fc16268f9..8c150de20 100644
--- a/lib/koproperty/editors/urledit.cpp
+++ b/lib/koproperty/editors/urledit.cpp
@@ -31,8 +31,8 @@
 
 using namespace KoProperty;
 
-URLEdit::URLEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+URLEdit::URLEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new KURLRequester(this);
diff --git a/lib/koproperty/editors/urledit.h b/lib/koproperty/editors/urledit.h
index 167738df3..bba720917 100644
--- a/lib/koproperty/editors/urledit.h
+++ b/lib/koproperty/editors/urledit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT URLEdit : public Widget
   TQ_OBJECT
 
 	public:
-		URLEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		URLEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~URLEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/factory.cpp b/lib/koproperty/factory.cpp
index 864d48956..03d466f4d 100644
--- a/lib/koproperty/factory.cpp
+++ b/lib/koproperty/factory.cpp
@@ -53,8 +53,8 @@ static KoProperty::FactoryManager* m_manager = 0;
 
 namespace KoProperty {
 
-CustomPropertyFactory::CustomPropertyFactory(TQObject *tqparent)
- : TQObject(tqparent)
+CustomPropertyFactory::CustomPropertyFactory(TQObject *parent)
+ : TQObject(parent)
 {
 }
 
@@ -241,23 +241,23 @@ FactoryManager::registerFactoryForProperties(const TQValueList<int> &propertyTyp
 }
 
 CustomProperty*
-FactoryManager::createCustomProperty(Property *tqparent)
+FactoryManager::createCustomProperty(Property *parent)
 {
-	const int type = tqparent->type();
+	const int type = parent->type();
 	CustomPropertyFactory *factory = d->registeredWidgets.find(type);
 	if (factory)
-		return factory->createCustomProperty(tqparent);
+		return factory->createCustomProperty(parent);
 
 	switch(type) {
 		case Size: case Size_Width: case Size_Height:
-			return new SizeCustomProperty(tqparent);
+			return new SizeCustomProperty(parent);
 		case Point: case Point_X: case Point_Y:
-			return new PointCustomProperty(tqparent);
+			return new PointCustomProperty(parent);
 		case Rect: case Rect_X: case Rect_Y: case Rect_Width: case Rect_Height:
-			return new RectCustomProperty(tqparent);
+			return new RectCustomProperty(parent);
 		case SizePolicy: case SizePolicy_HorStretch: case SizePolicy_VerStretch:
 		case SizePolicy_HorData: case SizePolicy_VerData:
-			return new SizePolicyCustomProperty(tqparent);
+			return new SizePolicyCustomProperty(parent);
 		default:
 			return 0;
 	}
diff --git a/lib/koproperty/factory.h b/lib/koproperty/factory.h
index 8abc93b32..8aca55387 100644
--- a/lib/koproperty/factory.h
+++ b/lib/koproperty/factory.h
@@ -43,17 +43,17 @@ class FactoryManagerPrivate;
 class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject
 {
 	public:
-		CustomPropertyFactory(TQObject *tqparent);
+		CustomPropertyFactory(TQObject *parent);
 		virtual ~CustomPropertyFactory();
 
-		/*! \return a new instance of custom property for \a tqparent.
+		/*! \return a new instance of custom property for \a parent.
 		 Implement this for property types you want to support.
-		 Use tqparent->type() to get type of the property. */
-		virtual CustomProperty* createCustomProperty(Property *tqparent) = 0;
+		 Use parent->type() to get type of the property. */
+		virtual CustomProperty* createCustomProperty(Property *parent) = 0;
 
 		/*! \return a new instance of custom property for \a property.
 		 Implement this for property editor types you want to support.
-		 Use tqparent->type() to get type of the property. */
+		 Use parent->type() to get type of the property. */
 		virtual Widget* createCustomWidget(Property *property) = 0;
 };
 
@@ -81,12 +81,12 @@ 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 tqparent and tqchildren 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>tqparent</b> type,
-     by adding CustomProperty::property() as tqparent in Property constructor.\n
+     Child properties are created in CustomProperty constructor of the <b>parent</b> type,
+     by adding CustomProperty::property() as parent in Property constructor.\n
      Child properties should return handleValue() == true and in CustomProperty::setValue(),
-     tqparent's Property::setValue() should be called, making sure that useCustomProperty argument is set
+     parent's Property::setValue() should be called, making sure that useCustomProperty argument is set
      to false.\n
      Parent's handleValue() should be set to false, unless you cannot store the property in a TQVariant.
      You just need to update tqchildren's value, making sure that useCustomProperty argument is set
@@ -116,7 +116,7 @@ class KOPROPERTY_EXPORT FactoryManager : public TQObject
 		/*! Registers a custom factory \a factory for handling property editor for \a editorType.
 		This custom factory will be used before defaults when widgetForProperty() is called.
 		\a creator is not owned by this Factory object, but it's good idea
-		to instantiate CustomPropertyFactory object itself as a child of Factory tqparent. For example:
+		to instantiate CustomPropertyFactory object itself as a child of Factory parent. For example:
 		\code
 			MyCustomPropertyFactory *f = new MyCustomPropertyFactory(KoProperty::Factory::self());
 			KoProperty::Factory::self()->registerEditor( MyCustomType, f );
@@ -133,7 +133,7 @@ class KOPROPERTY_EXPORT FactoryManager : public TQObject
 		CustomPropertyFactory *factoryForEditorType(int type);
 
 		/*! Creates and returns the editor for given property type.
-		Warning: editor and viewer widgets won't have tqparent widget. Property editor
+		Warning: editor and viewer widgets won't have parent widget. Property editor
 		cares about reparenting and deletion of returned widgets in machines.
 		If \a createWidget is false, just create child properties, not widget.*/
 		Widget* createWidgetForProperty(Property *property);
@@ -150,7 +150,7 @@ class KOPROPERTY_EXPORT FactoryManager : public TQObject
 		/*! This function is called in Property::Property() to create (optional)
 		  custom property. It creates the custom property for built-in types, or
 		  calls one of createCustomProperty function previously registered for other types. */
-		CustomProperty* createCustomProperty(Property *tqparent);
+		CustomProperty* createCustomProperty(Property *parent);
 
 		/*! \return a pointer to a property factory instance.*/
 		static FactoryManager* self();
diff --git a/lib/koproperty/property.cpp b/lib/koproperty/property.cpp
index 0add7b91d..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), tqparent(0), tqchildren(0), relatedProperties(0),
+		 sets(0), parent(0), tqchildren(0), relatedProperties(0),
 		 sortingKey(0)
 		{
 		}
@@ -98,7 +98,7 @@ class PropertyPrivate
 	TQPtrDict< TQGuardedPtr<Set> > *sets;
 //	TQValueList<Set*>  sets;
 
-	Property  *tqparent;
+	Property  *parent;
 	TQValueList<Property*>  *tqchildren;
 	//! list of properties with the same name (when intersecting buffers)
 	TQValueList<Property*>  *relatedProperties;
@@ -172,7 +172,7 @@ KoProperty::createValueListFromStringLists(const TQStringList &keys, const TQStr
 
 Property::Property(const TQCString &name, const TQVariant &value,
 	const TQString &caption, const TQString &description,
-	int type, Property* tqparent)
+	int type, Property* parent)
  : d( new PropertyPrivate() )
 {
 	d->name = name;
@@ -186,14 +186,14 @@ Property::Property(const TQCString &name, const TQVariant &value,
 
 	d->custom = FactoryManager::self()->createCustomProperty(this);
 
-	if (tqparent)
-		tqparent->addChild(this);
+	if (parent)
+		parent->addChild(this);
 	setValue(value, false);
 }
 
 Property::Property(const TQCString &name, const TQStringList &keys, const TQStringList &strings,
 	const TQVariant &value, const TQString &caption, const TQString &description, 
-	int type, Property* tqparent)
+	int type, Property* parent)
  : d( new PropertyPrivate() )
 {
 	d->name = name;
@@ -204,14 +204,14 @@ Property::Property(const TQCString &name, const TQStringList &keys, const TQStri
 
 	d->custom = FactoryManager::self()->createCustomProperty(this);
 
-	if (tqparent)
-		tqparent->addChild(this);
+	if (parent)
+		parent->addChild(this);
 	setValue(value, false);
 }
 
 Property::Property(const TQCString &name, ListData* listData, 
 	const TQVariant &value, const TQString &caption, const TQString &description, 
-	int type, Property* tqparent)
+	int type, Property* parent)
  : d( new PropertyPrivate() )
 {
 	d->name = name;
@@ -222,8 +222,8 @@ Property::Property(const TQCString &name, ListData* listData,
 
 	d->custom = FactoryManager::self()->createCustomProperty(this);
 
-	if (tqparent)
-		tqparent->addChild(this);
+	if (parent)
+		parent->addChild(this);
 	setValue(value, false);
 }
 
@@ -408,9 +408,9 @@ Property::resetValue()
 	if (cleared)
 		return; //property set has been cleared: no further actions make sense as 'this' is dead
 
-	// maybe tqparent  prop is also unchanged now
-	if(d->tqparent && d->tqparent->value() == d->tqparent->oldValue())
-		d->tqparent->d->changed = false;
+	// maybe parent  prop is also unchanged now
+	if(d->parent && d->parent->value() == d->parent->oldValue())
+		d->parent->d->changed = false;
 
 	if (d->sets) {
 		for (TQPtrDictIterator< TQGuardedPtr<Set> > it(*d->sets); it.current(); ++it) {
@@ -648,9 +648,9 @@ Property::child(const TQCString &name)
 }
 
 Property*
-Property::tqparent() const
+Property::parent() const
 {
-	return d->tqparent;
+	return d->parent;
 }
 
 void
@@ -664,7 +664,7 @@ Property::addChild(Property *prop)
 			d->tqchildren = new TQValueList<Property*>();
 		d->tqchildren->append(prop);
 		prop->setSortingKey(d->tqchildren->count());
-		prop->d->tqparent = this;
+		prop->d->parent = this;
 	}
 	else {
 		kopropertywarn << "Property::addChild(): property \"" << name() 
diff --git a/lib/koproperty/property.h b/lib/koproperty/property.h
index 8d7f01d6d..bc8a503ea 100644
--- a/lib/koproperty/property.h
+++ b/lib/koproperty/property.h
@@ -222,20 +222,20 @@ class KOPROPERTY_EXPORT Property
 		 (with newline, if any) for displaying within a property editor. */
 		Property(const TQCString &name, const TQVariant &value = TQVariant(),
 			const TQString &caption = TQString(), const TQString &description = TQString(),
-			int type = Auto, Property* tqparent = 0);
+			int type = Auto, Property* parent = 0);
 
 		/*! Constructs property of \ref ValueFromList type. */
 		Property(const TQCString &name, const TQStringList &keys, const TQStringList &strings,
 			const TQVariant &value = TQVariant(),
 			const TQString &caption = TQString(), const TQString &description = TQString(),
-			int type = ValueFromList, Property* tqparent = 0);
+			int type = ValueFromList, Property* parent = 0);
 
 		/*! Constructs property of \ref ValueFromList type.
 		 This is overload of the above ctor added for convenience. */
 		Property(const TQCString &name, ListData* listData,
 			const TQVariant &value = TQVariant(),
 			const TQString &caption = TQString(), const TQString &description = TQString(),
-			int type = ValueFromList, Property* tqparent = 0);
+			int type = ValueFromList, Property* parent = 0);
 
 		/*! Constructs a deep copy of \a prop property. */
 		Property(const Property &prop);
@@ -313,8 +313,8 @@ class KOPROPERTY_EXPORT Property
 		/*! \return a child property for \a name, or NULL if there is no property with that name. */
 		Property* child(const TQCString &name);
 
-		/*! \return tqparent property for this property, or NULL if there is no tqparent property. */
-		Property* tqparent() const;
+		/*! \return parent property for this property, or NULL if there is no parent property. */
+		Property* parent() const;
 
 		/*! \return the custom property for this property.or NULL if there was
 		no custom property defined. */
diff --git a/lib/koproperty/set.cpp b/lib/koproperty/set.cpp
index d508fc0ac..5845365f9 100644
--- a/lib/koproperty/set.cpp
+++ b/lib/koproperty/set.cpp
@@ -129,8 +129,8 @@ Set::Iterator::current() const
 
 //////////////////////////////////////////////
 
-Set::Set(TQObject *tqparent, const TQString &typeName)
-: TQObject(tqparent, typeName.latin1())
+Set::Set(TQObject *parent, const TQString &typeName)
+: TQObject(parent, typeName.latin1())
 {
 	d = new SetPrivate();
 	d->ownProperty = true;
@@ -140,7 +140,7 @@ Set::Set(TQObject *tqparent, const TQString &typeName)
 
 
 Set::Set(const Set &set)
- : TQObject(0 /* implicit sharing the tqparent is dangerous */, set.name())
+ : TQObject(0 /* implicit sharing the parent is dangerous */, set.name())
 {
 	d = new SetPrivate();
 	*this = set;
diff --git a/lib/koproperty/set.h b/lib/koproperty/set.h
index 9004c2c40..efb90cd9e 100644
--- a/lib/koproperty/set.h
+++ b/lib/koproperty/set.h
@@ -65,10 +65,10 @@ class KOPROPERTY_EXPORT Set : public TQObject
 				friend class Set;
 		};
 
-		explicit Set(TQObject *tqparent=0, const TQString &typeName=TQString());
+		explicit Set(TQObject *parent=0, const TQString &typeName=TQString());
 
 		/*! Constructs a deep copy of \a set. 
-		 The new object will not have a TQObject tqparent even if \a set has such tqparent. */
+		 The new object will not have a TQObject parent even if \a set has such parent. */
 		explicit Set(const Set& set);
 
 		virtual ~Set();
diff --git a/lib/koproperty/utils.h b/lib/koproperty/utils.h
index ad77bf901..c731624c4 100644
--- a/lib/koproperty/utils.h
+++ b/lib/koproperty/utils.h
@@ -30,7 +30,7 @@ namespace KoProperty {
 class KOPROPERTY_EXPORT GroupContainer : public TQWidget
 {
 	public:
-		GroupContainer(const TQString& title, TQWidget* tqparent);
+		GroupContainer(const TQString& title, TQWidget* parent);
 		~GroupContainer();
 
 		void setContents( TQWidget* contents );
diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp
index dd44c2b0e..b0169a963 100644
--- a/lib/koproperty/widget.cpp
+++ b/lib/koproperty/widget.cpp
@@ -55,8 +55,8 @@ class WidgetPrivate
 };
 }
 
-Widget::Widget(Property *property, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+Widget::Widget(Property *property, TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
 {
 	d = new WidgetPrivate();
 	d->property = property;
diff --git a/lib/koproperty/widget.h b/lib/koproperty/widget.h
index 9646ecc92..5ed858853 100644
--- a/lib/koproperty/widget.h
+++ b/lib/koproperty/widget.h
@@ -39,7 +39,7 @@ class KOPROPERTY_EXPORT Widget : public TQWidget
   TQ_OBJECT
 
 	public:
-		Widget(Property *property, TQWidget *tqparent, const char *name="property_editor");
+		Widget(Property *property, TQWidget *parent, const char *name="property_editor");
 		virtual ~Widget();
 
 		/*! \return the value currently entered in the item editor widget.*/
diff --git a/lib/koproperty/widgetproxy.cpp b/lib/koproperty/widgetproxy.cpp
index 946560387..a45583197 100644
--- a/lib/koproperty/widgetproxy.cpp
+++ b/lib/koproperty/widgetproxy.cpp
@@ -44,8 +44,8 @@ class WidgetProxyPrivate
 
 using namespace KoProperty;
 
-WidgetProxy::WidgetProxy(TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+WidgetProxy::WidgetProxy(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
 {
 	d = new WidgetProxyPrivate();
 	d->property = new Property();
diff --git a/lib/koproperty/widgetproxy.h b/lib/koproperty/widgetproxy.h
index 4724eb613..f63cbdd12 100644
--- a/lib/koproperty/widgetproxy.h
+++ b/lib/koproperty/widgetproxy.h
@@ -40,7 +40,7 @@ class KOPROPERTY_EXPORT WidgetProxy : public TQWidget
   TQ_OBJECT
 
 	public:
-		WidgetProxy(TQWidget *tqparent, const char *name=0);
+		WidgetProxy(TQWidget *parent, const char *name=0);
 		WidgetProxy();
 
 		void setPropertyType(int propertyType);
diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp
index 0c1b3575f..c93807a33 100644
--- a/lib/kotext/DateFormatWidget.cpp
+++ b/lib/kotext/DateFormatWidget.cpp
@@ -15,11 +15,11 @@
 #include <KoVariable.h>
 
 /*
- *  Constructs a DateFormatWidget which is a child of 'tqparent', with the
+ *  Constructs a DateFormatWidget which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'fl'
  */
-DateFormatWidget::DateFormatWidget( TQWidget* tqparent,  const char* name, WFlags fl )
-    : TimeDateFormatWidgetPrototype( tqparent, name, fl )
+DateFormatWidget::DateFormatWidget( TQWidget* parent,  const char* name, WFlags fl )
+    : TimeDateFormatWidgetPrototype( parent, name, fl )
 {
     setCaption( i18n( "DateFormat", "Format of Date Variable" ) );
     TQStringList listDateFormat = KoVariableDateFormat::staticTranslatedFormatPropsList();
diff --git a/lib/kotext/DateFormatWidget.h b/lib/kotext/DateFormatWidget.h
index 5f006d366..df0281802 100644
--- a/lib/kotext/DateFormatWidget.h
+++ b/lib/kotext/DateFormatWidget.h
@@ -8,7 +8,7 @@ class DateFormatWidget : public TimeDateFormatWidgetPrototype
   TQ_OBJECT
 
 public:
-    DateFormatWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+    DateFormatWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~DateFormatWidget();
     TQString resultString();
     int correctValue();
diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index 6dbb498f5..beaeb9f95 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -92,11 +92,11 @@ public:
     TQPalette m_palette;
 };
 
-KFontChooser_local::KFontChooser_local(TQWidget *tqparent, const char *name,
+KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
 			   bool onlyFixed, const TQStringList &fontList,
 			   bool makeFrame, int visibleListSize, bool diff,
                            TQButton::ToggleState *sizeIsRelativeState )
-  : TQWidget(tqparent, name), usingFixed(onlyFixed)
+  : TQWidget(parent, name), usingFixed(onlyFixed)
 {
   charsetsCombo = 0;
 
@@ -743,11 +743,11 @@ void KFontChooser_local::showXLFDArea(bool show)
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KFontDialog_local::KFontDialog_local( TQWidget *tqparent, const char* name,
+KFontDialog_local::KFontDialog_local( TQWidget *parent, const char* name,
 			  bool onlyFixed, bool modal,
 			  const TQStringList &fontList, bool makeFrame, bool diff,
                           TQButton::ToggleState *sizeIsRelativeState )
-  : KDialogBase( tqparent, name, modal, i18n("Select Font"), Ok|Cancel, Ok )
+  : KDialogBase( parent, name, modal, i18n("Select Font"), Ok|Cancel, Ok )
 {
   chooser = new KFontChooser_local( this, "fontChooser",
                               onlyFixed, fontList, makeFrame, 8,
@@ -757,10 +757,10 @@ KFontDialog_local::KFontDialog_local( TQWidget *tqparent, const char* name,
 
 
 int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed,
-                             TQWidget *tqparent, bool makeFrame,
+                             TQWidget *parent, bool makeFrame,
                              TQButton::ToggleState *sizeIsRelativeState )
 {
-  KFontDialog_local dlg( tqparent, "Font Selector", onlyFixed, true, TQStringList(),
+  KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(),
 		   makeFrame, true, sizeIsRelativeState );
   dlg.setFont( theFont, onlyFixed );
 
@@ -776,10 +776,10 @@ int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFi
 }
 
 int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed,
-                          TQWidget *tqparent, bool makeFrame,
+                          TQWidget *parent, bool makeFrame,
                           TQButton::ToggleState *sizeIsRelativeState )
 {
-  KFontDialog_local dlg( tqparent, "Font Selector", onlyFixed, true, TQStringList(),
+  KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(),
 		   makeFrame, false, sizeIsRelativeState );
   dlg.setFont( theFont, onlyFixed );
 
@@ -795,11 +795,11 @@ int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed,
 
 
 int KFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString,
-				 bool onlyFixed, TQWidget *tqparent,
+				 bool onlyFixed, TQWidget *parent,
 				 bool makeFrame,
                                  TQButton::ToggleState *sizeIsRelativeState )
 {
-  KFontDialog_local dlg( tqparent, "Font and Text Selector", onlyFixed, true,
+  KFontDialog_local dlg( parent, "Font and Text Selector", onlyFixed, true,
 		   TQStringList(), makeFrame, false, sizeIsRelativeState );
   dlg.setFont( theFont, onlyFixed );
 
diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/KFontDialog_local.h
index bb69cf571..921946af8 100644
--- a/lib/kotext/KFontDialog_local.h
+++ b/lib/kotext/KFontDialog_local.h
@@ -89,7 +89,7 @@ public:
    * <p>
    * The above creates a font chooser dialog with only SmoothScaleble fonts.
    *
-   * @param tqparent The tqparent widget.
+   * @param parent The parent widget.
    * @param name The widget name.
    * @param onlyFixed Only display fonts which have fixed-width
    *        character sizes.
@@ -109,7 +109,7 @@ public:
    *        *sizeIsRelativeState, user choice may be retrieved by
    *        calling sizeIsRelative().
    */
-  KFontChooser_local(TQWidget *tqparent = 0L, const char *name = 0L,
+  KFontChooser_local(TQWidget *parent = 0L, const char *name = 0L,
 	       bool onlyFixed = false,
 	       const TQStringList &fontList = TQStringList(),
 	       bool makeFrame = true, int visibleListSize=8,
@@ -143,7 +143,7 @@ public:
   void setFont( const TQFont &font, bool onlyFixed = false );
 
   /**
-   * @return The bittqmask corresponding to the attributes the user
+   * @return The bitmask corresponding to the attributes the user
    *         wishes to change.
    */
   int fontDiffFlags();
@@ -356,7 +356,7 @@ public:
   /**
    * Constructs a font selection dialog.
    *
-   * @param tqparent The tqparent widget of the dialog, if any.
+   * @param parent The parent widget of the dialog, if any.
    * @param name The name of the dialog.
    * @param modal Specifies whether the dialog is modal or not.
    * @param onlyFixed only display fonts which have fixed-width
@@ -375,7 +375,7 @@ public:
    *        calling sizeIsRelative().
    *
    */
-  KFontDialog_local( TQWidget *tqparent = 0L, const char *name = 0,
+  KFontDialog_local( TQWidget *parent = 0L, const char *name = 0,
 	       bool onlyFixed = false, bool modal = false,
 	       const TQStringList &fontlist = TQStringList(),
 	       bool makeFrame = true, bool diff = false,
@@ -419,7 +419,7 @@ public:
    * @param theFont a reference to the font to write the chosen font
    *        into.
    * @param onlyFixed if true, only select from fixed-width fonts.
-   * @param tqparent Parent widget of the dialog. Specifying a widget different
+   * @param parent Parent widget of the dialog. Specifying a widget different
    *        from 0 (Null) improves centering (looks better).
    * @param makeFrame Draws a frame with titles around the contents.
    * @param sizeIsRelativeState If not zero the widget will show a
@@ -432,7 +432,7 @@ public:
    * @return TQDialog::result().
    */
   static int getFont( TQFont &theFont, bool onlyFixed = false,
-		      TQWidget *tqparent = 0L, bool makeFrame = true,
+		      TQWidget *parent = 0L, bool makeFrame = true,
                       TQButton::ToggleState *sizeIsRelativeState = 0L );
 
   /**
@@ -444,8 +444,8 @@ public:
    * @param theFont a reference to the font to write the chosen font
    *        into.
    * @param diffFlags a reference to the int into which the chosen
-   *        difference selection bittqmask should be written.
-   *        Check the returned bittqmask like:
+   *        difference selection bitmask should be written.
+   *        Check the returned bitmask like:
    *        \code
    *        if ( diffFlags & KFontChooser_local::FontDiffFamily )
    *            [...]
@@ -455,7 +455,7 @@ public:
    *            [...]
    *        \endcode
    * @param onlyFixed if true, only select from fixed-width fonts.
-   * @param tqparent Parent widget of the dialog. Specifying a widget different
+   * @param parent Parent widget of the dialog. Specifying a widget different
    *        from 0 (Null) improves centering (looks better).
    * @param makeFrame Draws a frame with titles around the contents.
    * @param sizeIsRelativeState If not zero the widget will show a
@@ -468,7 +468,7 @@ public:
    * @returns TQDialog::result().
    */
   static int getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed = false,
-		      TQWidget *tqparent = 0L, bool makeFrame = true,
+		      TQWidget *parent = 0L, bool makeFrame = true,
                       TQButton::ToggleState *sizeIsRelativeState = 0L );
 
   /**
@@ -479,7 +479,7 @@ public:
    *        into.
    * @param theString a reference to the example text that was typed.
    * @param onlyFixed if true, only select from fixed-width fonts.
-   * @param tqparent Parent widget of the dialog. Specifying a widget different
+   * @param parent Parent widget of the dialog. Specifying a widget different
    *        from 0 (Null) improves centering (looks better).
    * @param makeFrame Draws a frame with titles around the contents.
    * @param sizeIsRelativeState If not zero the widget will show a
@@ -491,7 +491,7 @@ public:
    * @return The result of the dialog.
    */
   static int getFontAndText( TQFont &theFont, TQString &theString,
-			     bool onlyFixed = false, TQWidget *tqparent = 0L,
+			     bool onlyFixed = false, TQWidget *parent = 0L,
 			     bool makeFrame = true,
                              TQButton::ToggleState *sizeIsRelativeState = 0L );
 
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index dfe6c6df2..c45c0481b 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -48,8 +48,8 @@
 #include <tqregexp.h>
 
 
-KoCompletionBox::KoCompletionBox( TQWidget * tqparent, const char * name, WFlags f)
-  : TQLabel(tqparent,name,f)
+KoCompletionBox::KoCompletionBox( TQWidget * parent, const char * name, WFlags f)
+  : TQLabel(parent,name,f)
 {
   setBackgroundColor(TQColor("#FFFFE6"));
   setFocusPolicy(TQ_NoFocus);
diff --git a/lib/kotext/KoAutoFormat.h b/lib/kotext/KoAutoFormat.h
index 8f4199a2f..2f61cb18d 100644
--- a/lib/kotext/KoAutoFormat.h
+++ b/lib/kotext/KoAutoFormat.h
@@ -51,7 +51,7 @@ class KoCompletionBox : public TQLabel
   Q_OBJECT
   TQ_OBJECT
   public:
-    KoCompletionBox( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 );
+    KoCompletionBox( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
     ~KoCompletionBox();
     TQString& lastWord();
     void setLastWord(TQString const &);
diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp
index 90b1a97d3..e6dce371e 100644
--- a/lib/kotext/KoAutoFormatDia.cpp
+++ b/lib/kotext/KoAutoFormatDia.cpp
@@ -37,8 +37,8 @@
 #include <tqdir.h>
 #include <tqapplication.h>
 
-KoAutoFormatLineEdit::KoAutoFormatLineEdit ( TQWidget * tqparent, const char * name )
-    : TQLineEdit(tqparent,name)
+KoAutoFormatLineEdit::KoAutoFormatLineEdit ( TQWidget * parent, const char * name )
+    : TQLineEdit(parent,name)
 {
 }
 
@@ -58,8 +58,8 @@ void KoAutoFormatLineEdit::keyPressEvent ( TQKeyEvent *ke )
 /* Class: KoAutoFormatExceptionWidget                             */
 /******************************************************************/
 
-KoAutoFormatExceptionWidget::KoAutoFormatExceptionWidget(TQWidget *tqparent, const TQString &name,const TQStringList &_list, bool _autoInclude, bool _abreviation)
-    :TQWidget( tqparent )
+KoAutoFormatExceptionWidget::KoAutoFormatExceptionWidget(TQWidget *parent, const TQString &name,const TQStringList &_list, bool _autoInclude, bool _abreviation)
+    :TQWidget( parent )
 {
     m_bAbbreviation=_abreviation;
     m_listException=_list;
@@ -166,10 +166,10 @@ void KoAutoFormatExceptionWidget::slotExceptionListSelected()
 /* Class: KoAutoFormatDia                                         */
 /******************************************************************/
 
-KoAutoFormatDia::KoAutoFormatDia( TQWidget *tqparent, const char *name,
+KoAutoFormatDia::KoAutoFormatDia( TQWidget *parent, const char *name,
       KoAutoFormat * autoFormat )
     : KDialogBase( Tabbed, i18n("Autocorrection"), Ok | Cancel | User1, Ok,
-      tqparent, name, true, true, KGuiItem( i18n( "&Reset" ), "undo" )),
+      parent, name, true, true, KGuiItem( i18n( "&Reset" ), "undo" )),
       oSimpleBegin( autoFormat->getConfigTypographicSimpleQuotes().begin ),
       oSimpleEnd( autoFormat->getConfigTypographicSimpleQuotes().end ),
       oDoubleBegin( autoFormat->getConfigTypographicDoubleQuotes().begin ),
diff --git a/lib/kotext/KoAutoFormatDia.h b/lib/kotext/KoAutoFormatDia.h
index 3e8020e7f..14084af53 100644
--- a/lib/kotext/KoAutoFormatDia.h
+++ b/lib/kotext/KoAutoFormatDia.h
@@ -37,7 +37,7 @@ class KoAutoFormatLineEdit : public TQLineEdit
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoAutoFormatLineEdit ( TQWidget * tqparent, const char * name=0 );
+    KoAutoFormatLineEdit ( TQWidget * parent, const char * name=0 );
 
 protected:
     virtual void keyPressEvent ( TQKeyEvent * );
@@ -85,7 +85,7 @@ class KOTEXT_EXPORT KoAutoFormatDia : public KDialogBase
   TQ_OBJECT
 
 public:
-    KoAutoFormatDia( TQWidget *tqparent, const char *name, KoAutoFormat * autoFormat );
+    KoAutoFormatDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat );
     ~KoAutoFormatDia();
     void addEntryList(const TQString &key, KoAutoFormatEntry *_autoEntry);
     void editEntryList(const TQString &key,const TQString &newFindString, KoAutoFormatEntry *_autoEntry);
diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp
index ae2f3668e..13ca94577 100644
--- a/lib/kotext/KoBgSpellCheck.cpp
+++ b/lib/kotext/KoBgSpellCheck.cpp
@@ -59,9 +59,9 @@ public:
 
 static const int delayAfterMarked = 10;
 
-KoBgSpellCheck::KoBgSpellCheck( const Broker::Ptr& broker, TQObject *tqparent,
+KoBgSpellCheck::KoBgSpellCheck( const Broker::Ptr& broker, TQObject *parent,
                                 const char *name )
-    : TQObject( tqparent, name )
+    : TQObject( parent, name )
 {
 #ifdef DEBUG_BGSPELLCHECKING
     kdDebug(32500) << "KoBgSpellCheck::KoBgSpellCheck " << this << endl;
diff --git a/lib/kotext/KoBgSpellCheck.h b/lib/kotext/KoBgSpellCheck.h
index 08f47272d..9d96d84bc 100644
--- a/lib/kotext/KoBgSpellCheck.h
+++ b/lib/kotext/KoBgSpellCheck.h
@@ -34,7 +34,7 @@ class KOTEXT_EXPORT KoBgSpellCheck : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoBgSpellCheck( const KSpell2::Broker::Ptr& broker, TQObject *tqparent =0,
+    KoBgSpellCheck( const KSpell2::Broker::Ptr& broker, TQObject *parent =0,
                     const char *name =0 );
     virtual ~KoBgSpellCheck();
 
diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp
index 1d2409b30..8f7c2515c 100644
--- a/lib/kotext/KoChangeCaseDia.cpp
+++ b/lib/kotext/KoChangeCaseDia.cpp
@@ -27,8 +27,8 @@
 #include "KoChangeCaseDia.h"
 
 
-KoChangeCaseDia::KoChangeCaseDia( TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
+KoChangeCaseDia::KoChangeCaseDia( TQWidget *parent, const char *name )
+    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
 {
 
     setCaption( i18n("Change Case") );
diff --git a/lib/kotext/KoChangeCaseDia.h b/lib/kotext/KoChangeCaseDia.h
index 52b85e726..ace24d5a8 100644
--- a/lib/kotext/KoChangeCaseDia.h
+++ b/lib/kotext/KoChangeCaseDia.h
@@ -31,7 +31,7 @@ class KOTEXT_EXPORT KoChangeCaseDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoChangeCaseDia( TQWidget *tqparent, const char *name );
+    KoChangeCaseDia( TQWidget *parent, const char *name );
     enum TypeOfCase { UpperCase =0, LowerCase=1, TitleCase=2, ToggleCase=3, SentenceCase=4};
     TypeOfCase getTypeOfCase();
 
diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp
index 1e2640122..a6c8b2bbb 100644
--- a/lib/kotext/KoCommentDia.cpp
+++ b/lib/kotext/KoCommentDia.cpp
@@ -28,8 +28,8 @@
 #include <tqlabel.h>
 #include <kdebug.h>
 
-KoCommentDia::KoCommentDia( TQWidget *tqparent, const TQString &_note, const TQString & _authorName, const TQString &_createNote, const char *name )
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
+KoCommentDia::KoCommentDia( TQWidget *parent, const TQString &_note, const TQString & _authorName, const TQString &_createNote, const char *name )
+    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
 {
     setCaption( i18n("Edit Comment") );
     authorName = _authorName;
diff --git a/lib/kotext/KoCommentDia.h b/lib/kotext/KoCommentDia.h
index a925e8029..3f9465d6e 100644
--- a/lib/kotext/KoCommentDia.h
+++ b/lib/kotext/KoCommentDia.h
@@ -30,7 +30,7 @@ class KOTEXT_EXPORT KoCommentDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoCommentDia( TQWidget *tqparent, const TQString &_note=TQString(), const TQString & _authorName=TQString(), const TQString &_createNote=TQString(), const char *name=0L );
+    KoCommentDia( TQWidget *parent, const TQString &_note=TQString(), const TQString & _authorName=TQString(), const TQString &_createNote=TQString(), const char *name=0L );
     TQString commentText();
 
 private slots:
diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp
index 6289675df..66d8d374a 100644
--- a/lib/kotext/KoCompletionDia.cpp
+++ b/lib/kotext/KoCompletionDia.cpp
@@ -34,8 +34,8 @@
 #include <tqgroupbox.h>
 #include <tqwhatsthis.h>
 
-KoCompletionDia::KoCompletionDia( TQWidget *tqparent, const char *name, KoAutoFormat * autoFormat )
-    : KDialogBase( tqparent, name , true, i18n( "Completion" ), Ok|Cancel|User1,
+KoCompletionDia::KoCompletionDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat )
+    : KDialogBase( parent, name , true, i18n( "Completion" ), Ok|Cancel|User1,
       Ok, true, KGuiItem( i18n( "&Reset" ), "undo" ) )
 {
     TQVBox *page = makeVBoxMainWidget();
@@ -53,7 +53,7 @@ void KoCompletionDia::slotOk()
     KDialogBase::slotOk();
 }
 
-KoCompletion::KoCompletion(TQWidget *tqparent, KoAutoFormat *autoFormat) : KoCompletionBase(tqparent),
+KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompletionBase(parent),
       m_autoFormat( *autoFormat ),
       m_docAutoFormat( autoFormat )
 {
diff --git a/lib/kotext/KoCompletionDia.h b/lib/kotext/KoCompletionDia.h
index c29135aa6..1aefb39ab 100644
--- a/lib/kotext/KoCompletionDia.h
+++ b/lib/kotext/KoCompletionDia.h
@@ -31,7 +31,7 @@ class KoCompletion : public KoCompletionBase {
   TQ_OBJECT
 
 public:
-    KoCompletion(TQWidget *tqparent, KoAutoFormat *autoFormat );
+    KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat );
     void saveSettings();
 
 protected slots:
@@ -56,7 +56,7 @@ class KOTEXT_EXPORT KoCompletionDia : public KDialogBase {
   TQ_OBJECT
 
 public:
-    KoCompletionDia( TQWidget *tqparent, const char *name, KoAutoFormat * autoFormat );
+    KoCompletionDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat );
 
 protected slots:
     virtual void slotOk();
diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp
index 4239bf470..54599d075 100644
--- a/lib/kotext/KoComplexText.cpp
+++ b/lib/kotext/KoComplexText.cpp
@@ -55,14 +55,14 @@ KoBidiContext::KoBidiContext( uchar l, TQChar::Direction e, KoBidiContext *p, bo
 {
     if ( p )
 	p->ref();
-    tqparent = p;
+    parent = p;
     count = 0;
 }
 
 KoBidiContext::~KoBidiContext()
 {
-    if( tqparent && tqparent->deref() )
-	delete tqparent;
+    if( parent && parent->deref() )
+	delete parent;
 }
 
 static TQChar *tqshapeBuffer = 0;
@@ -924,8 +924,8 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co
 	TQChar::Direction dirCurrent;
 	if(current == (int)text.length()) {
 	    KoBidiContext *c = context;
-	    while ( c->tqparent )
-		c = c->tqparent;
+	    while ( c->parent )
+		c = c->parent;
 	    dirCurrent = c->dir;
 	} else if ( current == last ) {
 	    dirCurrent = ( basicDir != TQChar::DirON ? basicDir : basicDirection( text, current ) );
@@ -1008,7 +1008,7 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co
 	    }
 	case TQChar::DirPDF:
 	    {
-		KoBidiContext *c = context->tqparent;
+		KoBidiContext *c = context->parent;
 		if(c) {
 		    runs->append( new KoTextRun(sor, eor, context, dir) );
 		    ++eor; sor = eor; dir = TQChar::DirON; status.eor = TQChar::DirON;
diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h
index f4f4253f1..72abfbed4 100644
--- a/lib/kotext/KoComplexText.h
+++ b/lib/kotext/KoComplexText.h
@@ -74,15 +74,15 @@ struct TQ_EXPORT KoBiditqStatus {
 };
 
 struct TQ_EXPORT KoBidiContext : public TQShared {
-    // ### ref and deref tqparent?
-    KoBidiContext( uchar level, TQChar::Direction embedding, KoBidiContext *tqparent = 0, bool override = FALSE );
+    // ### ref and deref parent?
+    KoBidiContext( uchar level, TQChar::Direction embedding, KoBidiContext *parent = 0, bool override = FALSE );
     ~KoBidiContext();
 
     unsigned char level;
     bool override : 1;
     TQChar::Direction dir : 5;
 
-    KoBidiContext *tqparent;
+    KoBidiContext *parent;
 };
 
 struct TQ_EXPORT KoBidiControl {
diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp
index 648dc2525..e4b9f339e 100644
--- a/lib/kotext/KoCreateStyleDia.cpp
+++ b/lib/kotext/KoCreateStyleDia.cpp
@@ -25,8 +25,8 @@
 #include "KoCreateStyleDia.h"
 #include <kmessagebox.h>
 
-KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
+KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent, const char *name )
+    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
 {
     styleList=_list;
     setCaption( i18n("Create New Style") );
diff --git a/lib/kotext/KoCreateStyleDia.h b/lib/kotext/KoCreateStyleDia.h
index b4c6a5c5d..ea94e9fae 100644
--- a/lib/kotext/KoCreateStyleDia.h
+++ b/lib/kotext/KoCreateStyleDia.h
@@ -30,7 +30,7 @@ class KOTEXT_EXPORT KoCreateStyleDia : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoCreateStyleDia( const TQStringList & _list, TQWidget *tqparent, const char *name );
+    KoCreateStyleDia( const TQStringList & _list, TQWidget *parent, const char *name );
     TQString nameOfNewStyle()const;
 
 protected slots:
diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp
index fd28bfe6e..aa74d133f 100644
--- a/lib/kotext/KoCustomVariablesDia.cpp
+++ b/lib/kotext/KoCustomVariablesDia.cpp
@@ -37,15 +37,15 @@
  *
  ******************************************************************/
 
-KoVariableNameDia::KoVariableNameDia( TQWidget *tqparent )
-    : KDialogBase( tqparent, "", TRUE,i18n( "Entry Name" ),Ok|Cancel )
+KoVariableNameDia::KoVariableNameDia( TQWidget *parent )
+    : KDialogBase( parent, "", TRUE,i18n( "Entry Name" ),Ok|Cancel )
 {
     init();
 }
 
 
-KoVariableNameDia::KoVariableNameDia( TQWidget *tqparent, const TQPtrList<KoVariable>& vars )
-    : KDialogBase( tqparent, "", TRUE, i18n( "Variable Name" ), Ok|Cancel )
+KoVariableNameDia::KoVariableNameDia( TQWidget *parent, const TQPtrList<KoVariable>& vars )
+    : KDialogBase( parent, "", TRUE, i18n( "Variable Name" ), Ok|Cancel )
 {
 
     init();
@@ -97,8 +97,8 @@ void KoVariableNameDia::textChanged ( const TQString &_text )
  *
  ******************************************************************/
 
-KoCustomVariablesListItem::KoCustomVariablesListItem( TQListView *tqparent )
-    : TQListViewItem( tqparent )
+KoCustomVariablesListItem::KoCustomVariablesListItem( TQListView *parent )
+    : TQListViewItem( parent )
 {
     editWidget = new KLineEdit( listView()->viewport() );
     listView()->addChild( editWidget );
@@ -158,8 +158,8 @@ int KoCustomVariablesListItem::width( const TQFontMetrics & fm, const TQListView
  *
  ******************************************************************/
 
-KoCustomVariablesList::KoCustomVariablesList( TQWidget *tqparent )
-    : KListView( tqparent )
+KoCustomVariablesList::KoCustomVariablesList( TQWidget *parent )
+    : KListView( parent )
 {
     header()->setMovingEnabled( FALSE );
     addColumn( i18n( "Variable" ) );
@@ -204,8 +204,8 @@ void KoCustomVariablesList::updateItems()
  *
  ******************************************************************/
 
-KoCustomVariablesDia::KoCustomVariablesDia( TQWidget *tqparent, const TQPtrList<KoVariable> &variables )
-    : KDialogBase( tqparent, "", TRUE,i18n( "Variable Value Editor" ), Ok|Cancel )
+KoCustomVariablesDia::KoCustomVariablesDia( TQWidget *parent, const TQPtrList<KoVariable> &variables )
+    : KDialogBase( parent, "", TRUE,i18n( "Variable Value Editor" ), Ok|Cancel )
 {
 
     back = makeVBoxMainWidget();
@@ -248,8 +248,8 @@ void KoCustomVariablesDia::slotOk()
  *
  ******************************************************************/
 
-KoCustomVarDialog::KoCustomVarDialog( TQWidget *tqparent )
-    : KDialogBase( tqparent, "", TRUE,i18n( "Add Variable" ), Ok|Cancel )
+KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent )
+    : KDialogBase( parent, "", TRUE,i18n( "Add Variable" ), Ok|Cancel )
 {
     init();
     m_name->setFocus();
@@ -268,8 +268,8 @@ KoCustomVarDialog::KoCustomVarDialog( TQWidget *tqparent )
 
 }
 // edit existing variable
-KoCustomVarDialog::KoCustomVarDialog( TQWidget *tqparent, KoCustomVariable *var )
-    : KDialogBase( tqparent, "", TRUE,i18n( "Edit Variable" ), Ok|Cancel )
+KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent, KoCustomVariable *var )
+    : KDialogBase( parent, "", TRUE,i18n( "Edit Variable" ), Ok|Cancel )
 {
     m_var = var;
     init();
diff --git a/lib/kotext/KoCustomVariablesDia.h b/lib/kotext/KoCustomVariablesDia.h
index b5883ddb1..e2116045a 100644
--- a/lib/kotext/KoCustomVariablesDia.h
+++ b/lib/kotext/KoCustomVariablesDia.h
@@ -46,9 +46,9 @@ class KoVariableNameDia : public KDialogBase
 
 public:
     // For KWMailMergeVariableInsertDia
-    KoVariableNameDia( TQWidget *tqparent );
+    KoVariableNameDia( TQWidget *parent );
     // For kwview
-    KoVariableNameDia( TQWidget *tqparent, const TQPtrList<KoVariable> &vars );
+    KoVariableNameDia( TQWidget *parent, const TQPtrList<KoVariable> &vars );
     TQString getName() const;
 
 protected slots:
@@ -68,7 +68,7 @@ protected:
 class KoCustomVariablesListItem : public TQListViewItem
 {
 public:
-    KoCustomVariablesListItem( TQListView *tqparent );
+    KoCustomVariablesListItem( TQListView *parent );
 
     void setVariable( KoCustomVariable *v );
     KoCustomVariable *getVariable() const;
@@ -96,7 +96,7 @@ class KoCustomVariablesList : public KListView
   TQ_OBJECT
 
 public:
-    KoCustomVariablesList( TQWidget *tqparent );
+    KoCustomVariablesList( TQWidget *parent );
 
     void setValues();
     void updateItems();
@@ -120,7 +120,7 @@ class KOTEXT_EXPORT KoCustomVariablesDia : public KDialogBase
   TQ_OBJECT
 
 public:
-    KoCustomVariablesDia( TQWidget *tqparent, const TQPtrList<KoVariable> &variables );
+    KoCustomVariablesDia( TQWidget *parent, const TQPtrList<KoVariable> &variables );
 protected slots:
     void slotOk();
 
@@ -144,11 +144,11 @@ public:
     /**
      * Add new variable
      */
-    KoCustomVarDialog( TQWidget *tqparent );
+    KoCustomVarDialog( TQWidget *parent );
     /**
      * Edit existing variable @p var
      */
-    KoCustomVarDialog( TQWidget *tqparent, KoCustomVariable *var );
+    KoCustomVarDialog( TQWidget *parent, KoCustomVariable *var );
 
     virtual TQString name();
     virtual TQString value();
diff --git a/lib/kotext/KoDecorationTab.cpp b/lib/kotext/KoDecorationTab.cpp
index 8fb82755b..73e0789e5 100644
--- a/lib/kotext/KoDecorationTab.cpp
+++ b/lib/kotext/KoDecorationTab.cpp
@@ -29,8 +29,8 @@
 
 #include "KoDecorationTab.moc"
 
-KoDecorationTab::KoDecorationTab( TQWidget* tqparent, const char* name, WFlags fl )
-    : KoDecorationTabBase( tqparent, name, fl )
+KoDecorationTab::KoDecorationTab( TQWidget* parent, const char* name, WFlags fl )
+    : KoDecorationTabBase( parent, name, fl )
 {
     shadowDistanceKDoubleNumInput->setRange(0, 9, 0.5, false);
 
diff --git a/lib/kotext/KoDecorationTab.h b/lib/kotext/KoDecorationTab.h
index be5222fc5..6b396a88f 100644
--- a/lib/kotext/KoDecorationTab.h
+++ b/lib/kotext/KoDecorationTab.h
@@ -30,7 +30,7 @@ class KoDecorationTab : public KoDecorationTabBase
   TQ_OBJECT
 
 public:
-    KoDecorationTab( TQWidget* tqparent=0, const char* name=0, WFlags fl=0 );
+    KoDecorationTab( TQWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~KoDecorationTab();
 
     TQColor getTextColor() const;
diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp
index 93f3a21e6..258ea98da 100644
--- a/lib/kotext/KoFontDia.cpp
+++ b/lib/kotext/KoFontDia.cpp
@@ -45,8 +45,8 @@
 #include <kiconloader.h>
 
 KoFontDia::KoFontDia( const KoTextFormat& initialFormat,
-    KSpell2::Broker::Ptr broker, TQWidget* tqparent, const char* name )
-    : KDialogBase( tqparent, name, true,
+    KSpell2::Broker::Ptr broker, TQWidget* parent, const char* name )
+    : KDialogBase( parent, name, true,
     i18n("Select Font"), Ok|Cancel|User1|Apply, Ok ),
     m_initialFormat(initialFormat),
     m_changedFlags(KoTextFormat::NoFlags)
diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h
index ebd4a93fb..7f739d190 100644
--- a/lib/kotext/KoFontDia.h
+++ b/lib/kotext/KoFontDia.h
@@ -49,7 +49,7 @@ public:
     /// so that the font dialog can show which languages are supported for spellchecking.
     KoFontDia( const KoTextFormat& initialFormat,
                KSpell2::Broker::Ptr broker = 0,
-               TQWidget* tqparent = 0, const char* name = 0 );
+               TQWidget* parent = 0, const char* name = 0 );
 
     int changedFlags() const { return m_changedFlags; }
 
diff --git a/lib/kotext/KoFontDiaPreview.cpp b/lib/kotext/KoFontDiaPreview.cpp
index 04d56e4cb..f61306b07 100644
--- a/lib/kotext/KoFontDiaPreview.cpp
+++ b/lib/kotext/KoFontDiaPreview.cpp
@@ -35,8 +35,8 @@
 
 #include "KoFontDiaPreview.moc"
 
-KoFontDiaPreview::KoFontDiaPreview( TQWidget* tqparent, const char* name , WFlags fl )
-        : TQFrame( tqparent, name, fl )
+KoFontDiaPreview::KoFontDiaPreview( TQWidget* parent, const char* name , WFlags fl )
+        : TQFrame( parent, name, fl )
         ,m_text( i18n( "The quick brown dog jumps over the lazy cat." ) )
         ,displayText( i18n( "The quick brown dog jumps over the lazy cat." ) )
         ,m_font( KoGlobal::defaultFont() )
diff --git a/lib/kotext/KoFontDiaPreview.h b/lib/kotext/KoFontDiaPreview.h
index 5cba0fbc3..48bd459ef 100644
--- a/lib/kotext/KoFontDiaPreview.h
+++ b/lib/kotext/KoFontDiaPreview.h
@@ -37,7 +37,7 @@ public:
     /**
     * Constructor
     */
-    KoFontDiaPreview( TQWidget* tqparent =0, const char* name = 0, WFlags fl = 0 );
+    KoFontDiaPreview( TQWidget* parent =0, const char* name = 0, WFlags fl = 0 );
     ~KoFontDiaPreview();
 
     void setText( const TQString &text );
diff --git a/lib/kotext/KoFontTab.cpp b/lib/kotext/KoFontTab.cpp
index fe8f16212..da0b524ea 100644
--- a/lib/kotext/KoFontTab.cpp
+++ b/lib/kotext/KoFontTab.cpp
@@ -19,8 +19,8 @@
 
 #include "KoFontTab.h"
 
-KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* tqparent, const char* name, WFlags fl ) 
-        : KoFontTabBase( tqparent, name, fl )
+KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* parent, const char* name, WFlags fl ) 
+        : KoFontTabBase( parent, name, fl )
 {
     TQStringList list;
     KFontChooser_local::getFontList(list, fontListCriteria);
diff --git a/lib/kotext/KoFontTab.h b/lib/kotext/KoFontTab.h
index 5cb1d3bb2..5333e46a2 100644
--- a/lib/kotext/KoFontTab.h
+++ b/lib/kotext/KoFontTab.h
@@ -29,7 +29,7 @@ class KoFontTab : public KoFontTabBase
   TQ_OBJECT
 
 public:
-    KoFontTab( uint fontListCriteria=0, TQWidget* tqparent=0, const char* name=0, WFlags fl=0 );
+    KoFontTab( uint fontListCriteria=0, TQWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~KoFontTab();
 
     TQFont getSelection();
diff --git a/lib/kotext/KoHighlightingTab.cpp b/lib/kotext/KoHighlightingTab.cpp
index b2f829d1e..ab7b05775 100644
--- a/lib/kotext/KoHighlightingTab.cpp
+++ b/lib/kotext/KoHighlightingTab.cpp
@@ -31,8 +31,8 @@
 #include "KoHighlightingTab.moc"
 
 
-KoHighlightingTab::KoHighlightingTab( TQWidget* tqparent, const char* name, WFlags fl ) 
-        : KoHighlightingTabBase( tqparent, name, fl )
+KoHighlightingTab::KoHighlightingTab( TQWidget* parent, const char* name, WFlags fl ) 
+        : KoHighlightingTabBase( parent, name, fl )
 {
     underlineStyleKComboBox->insertStringList( KoTextFormat::underlineTypeList() );
     underlineLineStyleKComboBox->insertStringList( KoTextFormat::underlineStyleList() );
diff --git a/lib/kotext/KoHighlightingTab.h b/lib/kotext/KoHighlightingTab.h
index b60b6582f..d8ebc1d77 100644
--- a/lib/kotext/KoHighlightingTab.h
+++ b/lib/kotext/KoHighlightingTab.h
@@ -31,7 +31,7 @@ class KoHighlightingTab : public KoHighlightingTabBase
   TQ_OBJECT
 
 public:
-    KoHighlightingTab( TQWidget* tqparent=0, const char* name=0, WFlags fl=0 );
+    KoHighlightingTab( TQWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~KoHighlightingTab();
 
     KoTextFormat::UnderlineType getUnderline() const;
diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp
index 99ff15b48..327dbe53f 100644
--- a/lib/kotext/KoImportStyleDia.cpp
+++ b/lib/kotext/KoImportStyleDia.cpp
@@ -28,8 +28,8 @@
 #include <kdebug.h>
 #include <tqlabel.h>
 
-KoImportStyleDia::KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name , true, "", Ok|Cancel|User1, Ok, true )
+KoImportStyleDia::KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *parent, const char *name )
+    : KDialogBase( parent, name , true, "", Ok|Cancel|User1, Ok, true )
 {
     setCaption( i18n("Import Styles") );
     m_currentCollection = currentCollection;
diff --git a/lib/kotext/KoImportStyleDia.h b/lib/kotext/KoImportStyleDia.h
index eaf24f5c4..ea2ccf91b 100644
--- a/lib/kotext/KoImportStyleDia.h
+++ b/lib/kotext/KoImportStyleDia.h
@@ -34,7 +34,7 @@ class KOTEXT_EXPORT KoImportStyleDia : public KDialogBase
 public:
     /// @param currentCollection collection of styles already present in the document
     /// (this is used to avoid conflicts in the style names and displayNames)
-    KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name );
+    KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *parent, const char *name );
     ~KoImportStyleDia();
 
     const KoStyleCollection& importedStyles() const { return m_styleList; }
diff --git a/lib/kotext/KoLanguageTab.cpp b/lib/kotext/KoLanguageTab.cpp
index 2ec9fede7..cf7b261b4 100644
--- a/lib/kotext/KoLanguageTab.cpp
+++ b/lib/kotext/KoLanguageTab.cpp
@@ -28,8 +28,8 @@
 #include "KoLanguageTab.moc"
 
 
-KoLanguageTab::KoLanguageTab( KSpell2::Broker::Ptr broker, TQWidget* tqparent, const char* name, WFlags fl )
-        : KoLanguageTabBase( tqparent, name, fl )
+KoLanguageTab::KoLanguageTab( KSpell2::Broker::Ptr broker, TQWidget* parent, const char* name, WFlags fl )
+        : KoLanguageTabBase( parent, name, fl )
 {
     const TQStringList langNames = KoGlobal::listOfLanguages();
     const TQStringList langTags = KoGlobal::listTagOfLanguages();
diff --git a/lib/kotext/KoLanguageTab.h b/lib/kotext/KoLanguageTab.h
index f33c85e6b..76e4ddef1 100644
--- a/lib/kotext/KoLanguageTab.h
+++ b/lib/kotext/KoLanguageTab.h
@@ -30,7 +30,7 @@ class KoLanguageTab : public KoLanguageTabBase
   TQ_OBJECT
 
 public:
-    KoLanguageTab( KSpell2::Broker::Ptr broker = 0, TQWidget* tqparent=0, const char* name=0, WFlags fl=0 );
+    KoLanguageTab( KSpell2::Broker::Ptr broker = 0, TQWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~KoLanguageTab();
 
     TQString getLanguage() const;
diff --git a/lib/kotext/KoLayoutTab.cpp b/lib/kotext/KoLayoutTab.cpp
index 2ec9da693..9a2d4e18d 100644
--- a/lib/kotext/KoLayoutTab.cpp
+++ b/lib/kotext/KoLayoutTab.cpp
@@ -28,8 +28,8 @@
 
 #include "KoLayoutTab.moc"
 
-KoLayoutTab::KoLayoutTab( bool withSubSuperScript, TQWidget* tqparent, const char* name, WFlags fl ) 
-        : KoLayoutTabBase( tqparent, name, fl )
+KoLayoutTab::KoLayoutTab( bool withSubSuperScript, TQWidget* parent, const char* name, WFlags fl ) 
+        : KoLayoutTabBase( parent, name, fl )
 {
     if ( !withSubSuperScript ) positionButtonGroup->hide();
 
diff --git a/lib/kotext/KoLayoutTab.h b/lib/kotext/KoLayoutTab.h
index 611e3afa1..6b629eefd 100644
--- a/lib/kotext/KoLayoutTab.h
+++ b/lib/kotext/KoLayoutTab.h
@@ -29,7 +29,7 @@ class KoLayoutTab : public KoLayoutTabBase
   TQ_OBJECT
 
 public:
-    KoLayoutTab( bool withSubSuperScript, TQWidget* tqparent=0, const char* name=0, WFlags fl=0 );
+    KoLayoutTab( bool withSubSuperScript, TQWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~KoLayoutTab();
 
     KoTextFormat::VerticalAlignment getSubSuperScript() const;
diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp
index b5058f1b6..6126d6c5a 100644
--- a/lib/kotext/KoParagCounter.cpp
+++ b/lib/kotext/KoParagCounter.cpp
@@ -88,7 +88,7 @@ void KoParagCounter::tqinvalidate()
     m_cache.number = -1;
     m_cache.text = TQString();
     m_cache.width = -1;
-    m_cache.tqparent = INVALID_PARAG;
+    m_cache.parent = INVALID_PARAG;
     m_cache.counterFormat = 0;
 }
 
@@ -345,7 +345,7 @@ int KoParagCounter::number( const KoTextParag *paragraph )
     }
 
     // Go looking for another paragraph at the same level or higher level.
-    // (This code shares logic with tqparent())
+    // (This code shares logic with parent())
     KoTextParag *otherParagraph = paragraph->prev();
     KoParagCounter *otherCounter;
 
@@ -434,11 +434,11 @@ KoParagCounter::Numbering KoParagCounter::numbering() const
 }
 
 // Go looking for another paragraph at a higher level.
-KoTextParag *KoParagCounter::tqparent( const KoTextParag *paragraph )
+KoTextParag *KoParagCounter::parent( const KoTextParag *paragraph )
 {
     // Return cached value if possible.
-    if ( m_cache.tqparent != INVALID_PARAG )
-        return m_cache.tqparent;
+    if ( m_cache.parent != INVALID_PARAG )
+        return m_cache.parent;
 
     KoTextParag *otherParagraph = paragraph->prev();
     KoParagCounter *otherCounter;
@@ -489,8 +489,8 @@ KoTextParag *KoParagCounter::tqparent( const KoTextParag *paragraph )
         }
         break;
     }
-    m_cache.tqparent = otherParagraph;
-    return m_cache.tqparent;
+    m_cache.parent = otherParagraph;
+    return m_cache.parent;
 }
 
 TQString KoParagCounter::prefix() const
@@ -714,7 +714,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph )
     // If necessary, grab the text of the preceding levels.
     if ( m_displayLevels > 1 && m_numbering != NUM_NONE )
     {
-        KoTextParag* p = tqparent( paragraph );
+        KoTextParag* p = parent( paragraph );
         int displayLevels = TQMIN( m_displayLevels, m_depth+1 ); // can't be >depth+1
         for ( int level = 1 ; level < displayLevels ; ++level ) {
             //kdDebug() << "additional level=" << level << "/" << displayLevels-1 << endl;
@@ -740,7 +740,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph )
                 m_cache.text.prepend( str );
                 // Prepare next iteration
                 if ( level < displayLevels ) // no need to calc it if we won't use it
-                    p = counter->tqparent( p );
+                    p = counter->parent( p );
             }
             else // toplevel parents are missing
             {
diff --git a/lib/kotext/KoParagCounter.h b/lib/kotext/KoParagCounter.h
index 4f32df582..dbedb3e85 100644
--- a/lib/kotext/KoParagCounter.h
+++ b/lib/kotext/KoParagCounter.h
@@ -197,10 +197,10 @@ public:
 
 private:
 
-    /** Return our tqparent paragraph, if there is such a thing. For a paragraph "1.1.",
-     * the tqparent is the paragraph numbered "1.".
+    /** Return our parent paragraph, if there is such a thing. For a paragraph "1.1.",
+     * the parent is the paragraph numbered "1.".
      */
-    KoTextParag *tqparent( const KoTextParag *paragraph );
+    KoTextParag *parent( const KoTextParag *paragraph );
 
     Numbering m_numbering:3; // Numbering (maximum value: 8)
     bool m_restartCounter:1;
@@ -227,7 +227,7 @@ private:
      *  number of this counter                           -1
      *  text of this counter                             TQString()
      *  width of the label                               -1
-     *  tqparent                                           (KoTextParag *)-1
+     *  parent                                           (KoTextParag *)-1
      *  the format that was used to calculate the width  0
      */
     struct
@@ -235,7 +235,7 @@ private:
         int number;
         TQString text;
         int width;
-        KoTextParag *tqparent;
+        KoTextParag *parent;
         KoTextFormat * counterFormat;
     } m_cache;
 };
diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index 3ee02617d..4f6879560 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -54,8 +54,8 @@
 #include <tqapplication.h>
 #include <tqwidgetstack.h>
 
-KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTypeLetter, bool disableAll, TQWidget * tqparent, const char* name  )
-    :TQWidget( tqparent, name ),
+KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTypeLetter, bool disableAll, TQWidget * parent, const char* name  )
+    :TQWidget( parent, name ),
     stylesList()
 {
     noSignals = true;
@@ -405,8 +405,8 @@ void KoCounterStyleWidget::numStyleChanged() {
 
 
 
-KoSpinBox::KoSpinBox( TQWidget * tqparent, const char * name )
-    : TQSpinBox(tqparent,name)
+KoSpinBox::KoSpinBox( TQWidget * parent, const char * name )
+    : TQSpinBox(parent,name)
 {
     m_Etype=NONE;
     //max value supported by roman number
@@ -417,9 +417,9 @@ KoSpinBox::~KoSpinBox( )
 }
 
 KoSpinBox::KoSpinBox( int minValue, int maxValue, int step ,
-           TQWidget * tqparent , const char * name  )
+           TQWidget * parent , const char * name  )
     : TQSpinBox(minValue, maxValue,step ,
-           tqparent , name)
+           parent , name)
 {
     m_Etype=NONE;
 }
@@ -497,8 +497,8 @@ int KoSpinBox::mapTextToValue( bool * ok )
 /* class KPagePreview                                            */
 /******************************************************************/
 
-KPagePreview::KPagePreview( TQWidget* tqparent, const char* name )
-    : TQGroupBox( i18n( "Preview" ), tqparent, name )
+KPagePreview::KPagePreview( TQWidget* parent, const char* name )
+    : TQGroupBox( i18n( "Preview" ), parent, name )
 {
     left = 0;
     right = 0;
@@ -571,8 +571,8 @@ int KPagePreview::convert(double input) {
 /* class KPagePreview2                                           */
 /******************************************************************/
 
-KPagePreview2::KPagePreview2( TQWidget* tqparent, const char* name )
-    : TQGroupBox( i18n( "Preview" ), tqparent, name )
+KPagePreview2::KPagePreview2( TQWidget* parent, const char* name )
+    : TQGroupBox( i18n( "Preview" ), parent, name )
 {
     align = TQt::AlignLeft;
 }
@@ -650,8 +650,8 @@ void KPagePreview2::drawContents( TQPainter* p )
 /******************************************************************/
 
 
-KoBorderPreview::KoBorderPreview( TQWidget* tqparent, const char* name )
-    :TQFrame(tqparent,name)
+KoBorderPreview::KoBorderPreview( TQWidget* parent, const char* name )
+    :TQFrame(parent,name)
 {
 }
 
@@ -776,8 +776,8 @@ TQPen KoBorderPreview::setBorderPen( KoBorder _brd )
 /******************************************************************/
 class MyFlow : public KoTextFlow {
     public:
-        MyFlow(TQWidget *tqparent, KoTextZoomHandler *zoom) {
-            m_parent = tqparent;
+        MyFlow(TQWidget *parent, KoTextZoomHandler *zoom) {
+            m_parent = parent;
             m_zoomHandler = zoom;
         }
         int availableHeight() const {
@@ -788,8 +788,8 @@ class MyFlow : public KoTextFlow {
         KoTextZoomHandler *m_zoomHandler;
 };
 
-KoStylePreview::KoStylePreview( const TQString& title, const TQString& text, TQWidget* tqparent, const char* name )
-    : TQGroupBox( title, tqparent, name )
+KoStylePreview::KoStylePreview( const TQString& title, const TQString& text, TQWidget* parent, const char* name )
+    : TQGroupBox( title, parent, name )
 {
     setMinimumHeight(80);
     m_zoomHandler = new KoTextZoomHandler;
@@ -860,8 +860,8 @@ void KoStylePreview::drawContents( TQPainter *painter )
     painter->restore();
 }
 
-KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameWidth,TQWidget * tqparent, const char * name )
-        : KoParagLayoutWidget( KoParagDia::PD_SPACING, tqparent, name ), m_unit( unit )
+KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameWidth,TQWidget * parent, const char * name )
+        : KoParagLayoutWidget( KoParagDia::PD_SPACING, parent, name ), m_unit( unit )
 {
     TQString unitName = KoUnit::unitName( m_unit );
     TQGridLayout *mainGrid = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
@@ -1205,8 +1205,8 @@ void KoIndentSpacingWidget::afterChanged( double _val )
 }
 
 
-KoParagAlignWidget::KoParagAlignWidget( bool breakLine, TQWidget * tqparent, const char * name )
-        : KoParagLayoutWidget( KoParagDia::PD_ALIGN, tqparent, name )
+KoParagAlignWidget::KoParagAlignWidget( bool breakLine, TQWidget * parent, const char * name )
+        : KoParagLayoutWidget( KoParagDia::PD_ALIGN, parent, name )
 {
     TQGridLayout *grid = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
@@ -1359,9 +1359,9 @@ void KoParagAlignWidget::clearAligns()
 
 ////////////////////////////////////////////////////////////////////////////////
 
-KoParagDecorationWidget::KoParagDecorationWidget( TQWidget * tqparent,
+KoParagDecorationWidget::KoParagDecorationWidget( TQWidget * parent,
                                                     const char * name )
-    : KoParagLayoutWidget( KoParagDia::PD_DECORATION, tqparent, name )
+    : KoParagLayoutWidget( KoParagDia::PD_DECORATION, parent, name )
 {
     TQVBoxLayout *tabLayout = new TQVBoxLayout( this );
     wDeco = new KoParagDecorationTab( this );
@@ -1594,8 +1594,8 @@ void KoParagDecorationWidget::brdJoinToggled( bool _on ) {
 ////////////////////////////////////////////////////////////////////////////////
 
 
-KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * tqparent, const char * name )
-    : KoParagLayoutWidget( KoParagDia::PD_NUMBERING, tqparent, name )
+KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, const char * name )
+    : KoParagLayoutWidget( KoParagDia::PD_NUMBERING, parent, name )
 {
 
     TQVBoxLayout *Form1Layout = new TQVBoxLayout( this );
@@ -1720,8 +1720,8 @@ void KoParagCounterWidget::save( KoParagLayout & lay ) {
         lay.counter = new KoParagCounter( m_counter );
 }
 
-KoTabulatorsLineEdit::KoTabulatorsLineEdit( TQWidget *tqparent, double lower, double upper, double step, double value /*= 0.0*/, KoUnit::Unit unit /*= KoUnit::U_PT*/, unsigned int precision /*= 2*/, const char *name /*= 0*/ )
-    : KoUnitDoubleSpinBox ( tqparent, lower, upper, step, value, unit, precision, name )
+KoTabulatorsLineEdit::KoTabulatorsLineEdit( TQWidget *parent, double lower, double upper, double step, double value /*= 0.0*/, KoUnit::Unit unit /*= KoUnit::U_PT*/, unsigned int precision /*= 2*/, const char *name /*= 0*/ )
+    : KoUnitDoubleSpinBox ( parent, lower, upper, step, value, unit, precision, name )
 {
     setRange( 0, 9999, 1, false);
 }
@@ -1737,8 +1737,8 @@ void KoTabulatorsLineEdit::keyPressEvent ( TQKeyEvent *ke )
     KoUnitDoubleSpinBox::keyPressEvent (ke);
 }
 
-KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double frameWidth,TQWidget * tqparent, const char * name )
-    : KoParagLayoutWidget( KoParagDia::PD_TABS, tqparent, name ), m_unit(unit) {
+KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double frameWidth,TQWidget * parent, const char * name )
+    : KoParagLayoutWidget( KoParagDia::PD_TABS, parent, name ), m_unit(unit) {
     TQString length;
     if(frameWidth==-1) {
         frameWidth=9999;
@@ -2147,9 +2147,9 @@ TQString KoParagTabulatorsWidget::tabName() {
 /******************************************************************/
 /* Class: KoParagDia                                              */
 /******************************************************************/
-KoParagDia::KoParagDia( TQWidget* tqparent, const char* name,
+KoParagDia::KoParagDia( TQWidget* parent, const char* name,
                         int flags, KoUnit::Unit unit, double _frameWidth, bool breakLine, bool disableAll )
-    : KDialogBase(Tabbed, TQString(), Ok | Cancel | User1 | Apply, Ok, tqparent, name, true )
+    : KDialogBase(Tabbed, TQString(), Ok | Cancel | User1 | Apply, Ok, parent, name, true )
 {
     m_decorationsWidget = 0;
     m_flags = flags;
diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h
index 6de8115e6..c4bbed925 100644
--- a/lib/kotext/KoParagDia.h
+++ b/lib/kotext/KoParagDia.h
@@ -74,9 +74,9 @@ class KOTEXT_EXPORT KoParagLayoutWidget : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    // Constructor: tqparent widget, flag (PD_SOMETHING) and name
-    KoParagLayoutWidget( int flag, TQWidget * tqparent, const char * name = 0 )
-        : TQWidget( tqparent, name ), m_flag( flag )
+    // Constructor: parent widget, flag (PD_SOMETHING) and name
+    KoParagLayoutWidget( int flag, TQWidget * parent, const char * name = 0 )
+        : TQWidget( parent, name ), m_flag( flag )
     {
     }
     virtual ~KoParagLayoutWidget() {}
@@ -110,7 +110,7 @@ class KOTEXT_EXPORT KoIndentSpacingWidget : public KoParagLayoutWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoIndentSpacingWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * tqparent,const char * name = 0 );
+    KoIndentSpacingWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * parent,const char * name = 0 );
     virtual ~KoIndentSpacingWidget() {}
 
     virtual void display( const KoParagLayout & lay );
@@ -154,7 +154,7 @@ class KOTEXT_EXPORT KoParagAlignWidget : public KoParagLayoutWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoParagAlignWidget(bool breakLine, TQWidget * tqparent, const char * name = 0 );
+    KoParagAlignWidget(bool breakLine, TQWidget * parent, const char * name = 0 );
     virtual ~KoParagAlignWidget() {}
 
     virtual void display( const KoParagLayout & lay );
@@ -188,7 +188,7 @@ class KOTEXT_EXPORT KoParagDecorationWidget : public KoParagLayoutWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoParagDecorationWidget( TQWidget * tqparent, const char * name = 0 );
+    KoParagDecorationWidget( TQWidget * parent, const char * name = 0 );
     virtual ~KoParagDecorationWidget() {}
 
     virtual void display( const KoParagLayout & lay );
@@ -265,7 +265,7 @@ class KOTEXT_EXPORT KoCounterStyleWidget : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoCounterStyleWidget( bool displayDepth= true, bool onlyStyleTypeLetter = false, bool disableAll=false, TQWidget* tqparent = 0, const char* name = 0 );
+    KoCounterStyleWidget( bool displayDepth= true, bool onlyStyleTypeLetter = false, bool disableAll=false, TQWidget* parent = 0, const char* name = 0 );
 
     class StyleRepresenter {
         public:
@@ -348,7 +348,7 @@ class KOTEXT_EXPORT KoParagCounterWidget : public KoParagLayoutWidget
   TQ_OBJECT
 public:
 
-    KoParagCounterWidget( bool disableAll=false ,TQWidget * tqparent=0L, const char * name = 0 );
+    KoParagCounterWidget( bool disableAll=false ,TQWidget * parent=0L, const char * name = 0 );
     virtual ~KoParagCounterWidget() {}
 
     virtual void display( const KoParagLayout & lay );
@@ -392,7 +392,7 @@ class KoTabulatorsLineEdit : public KoUnitDoubleSpinBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoTabulatorsLineEdit( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0,
+    KoTabulatorsLineEdit( TQWidget *parent, double lower, double upper, double step, double value = 0.0,
                          KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
 
 protected:
@@ -409,7 +409,7 @@ class KOTEXT_EXPORT KoParagTabulatorsWidget : public KoParagLayoutWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoParagTabulatorsWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * tqparent, const char * name = 0 );
+    KoParagTabulatorsWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * parent, const char * name = 0 );
     virtual ~KoParagTabulatorsWidget() {}
 
     virtual void display( const KoParagLayout & lay );
@@ -471,7 +471,7 @@ class KoStylePreview : public TQGroupBox
   TQ_OBJECT
 
 public:
-    KoStylePreview( const TQString &title, const TQString &text, TQWidget *tqparent, const char* name = 0 );
+    KoStylePreview( const TQString &title, const TQString &text, TQWidget *parent, const char* name = 0 );
     virtual ~KoStylePreview();
 
     /** Apply the given @p style to the preview.
diff --git a/lib/kotext/KoParagDia_p.h b/lib/kotext/KoParagDia_p.h
index 18b75a94c..a1ca5737f 100644
--- a/lib/kotext/KoParagDia_p.h
+++ b/lib/kotext/KoParagDia_p.h
@@ -42,8 +42,8 @@ public:
     enum counterType{ NONE,NUM,ALPHAB_L,ALPHAB_U,ROM_NUM_L,ROM_NUM_U};
 
     KoSpinBox( int minValue, int maxValue, int step = 1,
-           TQWidget * tqparent = 0, const char * name = 0 );
-    KoSpinBox( TQWidget * tqparent = 0, const char * name = 0 );
+           TQWidget * parent = 0, const char * name = 0 );
+    KoSpinBox( TQWidget * parent = 0, const char * name = 0 );
     virtual ~KoSpinBox();
     virtual TQString mapValueToText( int value );
     virtual int mapTextToValue( bool * ok );
diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp
index 96209cba1..a68c6768c 100644
--- a/lib/kotext/KoParagStyle.cpp
+++ b/lib/kotext/KoParagStyle.cpp
@@ -96,7 +96,7 @@ void KoParagStyle::saveStyle( TQDomElement & parentElem )
         parentElem.appendChild( element );
         element.setAttribute( "name", followingStyle()->displayName() );
     }
-    // TODO save tqparent style, and inherited flags.
+    // TODO save parent style, and inherited flags.
 
     parentElem.setAttribute( "outline", m_bOutline ? "true" : "false" );
 }
diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index 5df4c93dd..7b51bb4fa 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -933,7 +933,7 @@ bool KoTextCursor::removePreviousChar()
 	// shouldn't be needed, just to make sure.
 	fixCursorPosition();
 	string->format( -1, TRUE );
-	//else if ( string->document() && string->document()->tqparent() )
+	//else if ( string->document() && string->document()->parent() )
 	//    string->document()->nextDoubleBuffered = TRUE;
 	return FALSE;
     } else if ( string->prev() ) {
@@ -952,7 +952,7 @@ bool KoTextCursor::remove()
 	int next = string->string()->nextCursorPosition( idx );
 	string->remove( idx, next-idx );
 	string->format( -1, TRUE );
-	//else if ( doc && doc->tqparent() )
+	//else if ( doc && doc->parent() )
 	//    doc->nextDoubleBuffered = TRUE;
 	return FALSE;
     } else if ( string->next() ) {
@@ -990,7 +990,7 @@ void KoTextCursor::killLine()
 	return;
     string->remove( idx, string->length() - idx - 1 );
     string->format( -1, TRUE );
-    //else if ( doc && doc->tqparent() )
+    //else if ( doc && doc->parent() )
     //doc->nextDoubleBuffered = TRUE;
 }
 
@@ -1690,7 +1690,7 @@ int KoTextFormatterBase::formatVertically( KoTextDocument* doc, KoTextParag* par
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 KoTextCustomItem::KoTextCustomItem( KoTextDocument *p )
-      :  width(-1), height(0), tqparent(p), xpos(0), ypos(-1), parag(0)
+      :  width(-1), height(0), parent(p), xpos(0), ypos(-1), parag(0)
 {
     m_deleted = false; // added for kotext
 }
diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h
index e161b2fe3..44c360d5b 100644
--- a/lib/kotext/KoRichText.h
+++ b/lib/kotext/KoRichText.h
@@ -497,7 +497,7 @@ public:
     int stretch() const { return stretch_; }
 
     KoTextDocument* richText()  const { return richtext; }
-    KoTextTable* table() const { return tqparent; }
+    KoTextTable* table() const { return parent; }
 
     void draw( int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected );
 
@@ -510,7 +510,7 @@ public:
 private:
     TQPainter* painter() const;
     TQRect geom;
-    KoTextTable* tqparent;
+    KoTextTable* parent;
     KoTextDocument* richtext;
     int row_;
     int col_;
diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp
index 0acd88ccb..a41de932c 100644
--- a/lib/kotext/KoSearchDia.cpp
+++ b/lib/kotext/KoSearchDia.cpp
@@ -62,11 +62,11 @@ KoSearchContext::~KoSearchContext()
 }
 
 
-KoSearchContextUI::KoSearchContextUI( KoSearchContext *ctx, TQWidget *tqparent )
-    : TQObject(tqparent), m_ctx(ctx), m_parent(tqparent)
+KoSearchContextUI::KoSearchContextUI( KoSearchContext *ctx, TQWidget *parent )
+    : TQObject(parent), m_ctx(ctx), m_parent(parent)
 {
     m_bOptionsShown = false;
-    m_btnShowOptions = new TQPushButton( i18n("Show Formatting Options"), tqparent );
+    m_btnShowOptions = new TQPushButton( i18n("Show Formatting Options"), parent );
     connect( m_btnShowOptions, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowOptions() ) );
 
     m_grid = new TQGridLayout( m_parent, 1, 1, 0, 6 );
@@ -100,8 +100,8 @@ void KoSearchContextUI::setCtxHistory( const TQStringList & history )
     m_ctx->m_strings = history;
 }
 
-KoSearchDia::KoSearchDia( TQWidget * tqparent,const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor )
-    : KFindDialog( tqparent, name, find->m_options, find->m_strings )
+KoSearchDia::KoSearchDia( TQWidget * parent,const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor )
+    : KFindDialog( parent, name, find->m_options, find->m_strings )
 {
     // The dialog extension.
     m_findUI = new KoSearchContextUI( find, findExtension() );
@@ -119,8 +119,8 @@ void KoSearchDia::slotOk()
     m_findUI->setCtxHistory( findHistory() );
 }
 
-KoReplaceDia::KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor )
-    : KReplaceDialog( tqparent, name, find->m_options, find->m_strings, replace->m_strings )
+KoReplaceDia::KoReplaceDia( TQWidget *parent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor )
+    : KReplaceDialog( parent, name, find->m_options, find->m_strings, replace->m_strings )
 {
     // The dialog extension.
     m_findUI = new KoSearchContextUI( find, findExtension() );
@@ -146,8 +146,8 @@ void KoReplaceDia::slotOk()
 
 
 
-KoFindReplace::KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView )
-    : m_find( new KoTextFind( dialog->pattern(), dialog->options(), this, tqparent ) ),
+KoFindReplace::KoFindReplace( TQWidget * parent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView )
+    : m_find( new KoTextFind( dialog->pattern(), dialog->options(), this, parent ) ),
       m_replace( 0L ),
       m_searchContext( *dialog->searchContext() ),
       m_replaceContext(),
@@ -161,9 +161,9 @@ KoFindReplace::KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const T
     connectFind( m_find );
 }
 
-KoFindReplace::KoFindReplace( TQWidget * tqparent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView )
+KoFindReplace::KoFindReplace( TQWidget * parent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView )
     : m_find( 0L ),
-      m_replace( new KoTextReplace( dialog->pattern(), dialog->replacement(), dialog->options(), this, tqparent ) ),
+      m_replace( new KoTextReplace( dialog->pattern(), dialog->replacement(), dialog->options(), this, parent ) ),
       m_searchContext( *dialog->searchContext() ),
       m_replaceContext( *dialog->replaceContext() ),
       m_searchContextEnabled( dialog->optionFindSelected() ),
@@ -510,8 +510,8 @@ int KoFindReplace::numReplacements() const
 
 ////
 
-KoTextFind::KoTextFind( const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *tqparent )
-    : KFind( pattern, options, tqparent),
+KoTextFind::KoTextFind( const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *parent )
+    : KFind( pattern, options, parent),
       m_findReplace( _findReplace)
 {
 }
@@ -525,8 +525,8 @@ bool KoTextFind::validateMatch( const TQString &text, int index, int matchedleng
     return m_findReplace->validateMatch( text, index, matchedlength );
 }
 
-KoTextReplace::KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *tqparent )
-    : KReplace( pattern, replacement, options, tqparent),
+KoTextReplace::KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *parent )
+    : KReplace( pattern, replacement, options, parent),
       m_findReplace( _findReplace)
 {
 }
@@ -540,8 +540,8 @@ bool KoTextReplace::validateMatch( const TQString &text, int index, int matchedl
     return m_findReplace->validateMatch( text, index, matchedlength );
 }
 
-KoFormatDia::KoFormatDia( TQWidget* tqparent, const TQString & _caption, KoSearchContext *_ctx ,  const char* name)
-    : KDialogBase( tqparent, name, true, _caption, Ok|Cancel|User1 |User2 ),
+KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchContext *_ctx ,  const char* name)
+    : KDialogBase( parent, name, true, _caption, Ok|Cancel|User1 |User2 ),
       m_ctx(_ctx)
 {
     TQWidget *page = new TQWidget( this );
diff --git a/lib/kotext/KoSearchDia.h b/lib/kotext/KoSearchDia.h
index 49eb75d13..e833cbc97 100644
--- a/lib/kotext/KoSearchDia.h
+++ b/lib/kotext/KoSearchDia.h
@@ -102,7 +102,7 @@ class KoSearchContextUI : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoSearchContextUI( KoSearchContext *ctx, TQWidget *tqparent );
+    KoSearchContextUI( KoSearchContext *ctx, TQWidget *parent );
     void setCtxOptions( long options );
     void setCtxHistory( const TQStringList & history );
     KoSearchContext *context() const { return m_ctx;}
@@ -128,7 +128,7 @@ class KOTEXT_EXPORT KoSearchDia:
   TQ_OBJECT
 
 public:
-    KoSearchDia( TQWidget *tqparent, const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor );
+    KoSearchDia( TQWidget *parent, const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor );
     KoSearchContext * searchContext() {
         return m_findUI->context();
     }
@@ -152,7 +152,7 @@ class KOTEXT_EXPORT KoReplaceDia:
 
 public:
 
-    KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor );
+    KoReplaceDia( TQWidget *parent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor );
     KoSearchContext * searchContext() {
         return m_findUI->context();
     }
@@ -178,7 +178,7 @@ class KoTextFind : public KFind
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoTextFind(const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *tqparent = 0);
+    KoTextFind(const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *parent = 0);
     ~KoTextFind();
     virtual bool validateMatch( const TQString &text, int index, int matchedlength );
 private:
@@ -193,7 +193,7 @@ class KoTextReplace : public KReplace
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *tqparent = 0);
+    KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *parent = 0);
     ~KoTextReplace();
     virtual bool validateMatch( const TQString &text, int index, int matchedlength );
 private:
@@ -209,8 +209,8 @@ class KOTEXT_EXPORT KoFindReplace : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView );
-    KoFindReplace( TQWidget * tqparent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView );
+    KoFindReplace( TQWidget * parent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView );
+    KoFindReplace( TQWidget * parent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView );
     ~KoFindReplace();
 
     KoTextParag *currentParag() {
@@ -299,7 +299,7 @@ class KoFormatDia: public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoFormatDia( TQWidget* tqparent, const TQString & _caption, KoSearchContext *_ctx, const char* name=0L);
+    KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchContext *_ctx, const char* name=0L);
     //apply to parameter to context !
     void ctxOptions( );
 
diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp
index 87ef18036..d0361b4c4 100644
--- a/lib/kotext/KoSpell.cpp
+++ b/lib/kotext/KoSpell.cpp
@@ -49,9 +49,9 @@ public:
     KoTextDocument *lastTxtDocument;
 };
 
-KoSpell::KoSpell( const Broker::Ptr& broker,  TQObject *tqparent,
+KoSpell::KoSpell( const Broker::Ptr& broker,  TQObject *parent,
                   const char *name )
-    : BackgroundChecker( broker, tqparent, name )
+    : BackgroundChecker( broker, parent, name )
 {
     d = new Private;
     d->parag = 0;
diff --git a/lib/kotext/KoSpell.h b/lib/kotext/KoSpell.h
index 4c1ee72ce..55c3971c5 100644
--- a/lib/kotext/KoSpell.h
+++ b/lib/kotext/KoSpell.h
@@ -48,7 +48,7 @@ class KOTEXT_EXPORT KoSpell : public KSpell2::BackgroundChecker
   TQ_OBJECT
 
 public:
-    KoSpell( const KSpell2::Broker::Ptr& broker, TQObject *tqparent =0,
+    KoSpell( const KSpell2::Broker::Ptr& broker, TQObject *parent =0,
              const char *name =0 );
     /**
      * The destructor instructs ISpell/ASpell to write out the personal
diff --git a/lib/kotext/KoStyleCollection.cpp b/lib/kotext/KoStyleCollection.cpp
index 7313e7be6..f8c93f01f 100644
--- a/lib/kotext/KoStyleCollection.cpp
+++ b/lib/kotext/KoStyleCollection.cpp
@@ -98,7 +98,7 @@ int KoStyleCollection::loadOasisStyles( KoOasisContext& context )
 	}
     }
 
-    // TODO the same thing for style inheritance (style:tqparent-style-name) and setParentStyle()
+    // TODO the same thing for style inheritance (style:parent-style-name) and setParentStyle()
 
     Q_ASSERT( defaultStyle() );
     return stylesLoaded;
@@ -107,7 +107,7 @@ int KoStyleCollection::loadOasisStyles( KoOasisContext& context )
 void KoStyleCollection::saveOasis( KoGenStyles& styles, int styleType, KoSavingContext& context ) const
 {
     // In order to reduce the bloat, we define that the first style (usually Standard)
-    // is the "tqparent" (reference) for the others.
+    // is the "parent" (reference) for the others.
     // ## This is mostly a hack due to lack of proper style inheritance.
     // Once that's implemented, default to 'styles derive from Standard', but save normally.
     TQString refStyleName;
diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp
index e921ff1e5..e5a7dbfa2 100644
--- a/lib/kotext/KoStyleManager.cpp
+++ b/lib/kotext/KoStyleManager.cpp
@@ -370,11 +370,11 @@ void KoStyleManager::save() {
         else
         {
           int indexParentStyle=styleIndex( m_inheritCombo->currentItem()-1 );
-          KoParagStyle *tqparent=m_origStyles.at(indexParentStyle);
-          if( tqparent==0L )  //If not found in the orig list (means its a new Style) look in the changeStyles list
-            tqparent=m_changedStyles.at(indexParentStyle);
+          KoParagStyle *parent=m_origStyles.at(indexParentStyle);
+          if( parent==0L )  //If not found in the orig list (means its a new Style) look in the changeStyles list
+            parent=m_changedStyles.at(indexParentStyle);
 
-            m_currentStyle->setParentStyle( tqparent );
+            m_currentStyle->setParentStyle( parent );
         }
 
         if ( d->cbIncludeInTOC )
@@ -447,7 +447,7 @@ void KoStyleManager::updateInheritStyle( KoParagStyle *s )
     for ( KoParagStyle* p = m_changedStyles.first(); p != 0L; p = m_changedStyles.next() )
     {
         //when we remove style, we must replace inherite style to 0L
-        //when tqparent style was removed.
+        //when parent style was removed.
         //##########Laurent change inherited style attribute
         if ( p->parentStyle() == s)
             p->setParentStyle(0L);
@@ -649,8 +649,8 @@ void KoStyleManager::renameStyle(const TQString &theText) {
 
 /////////////
 
-KoStyleParagTab::KoStyleParagTab( TQWidget * tqparent )
-    : KoStyleManagerTab( tqparent )
+KoStyleParagTab::KoStyleParagTab( TQWidget * parent )
+    : KoStyleManagerTab( parent )
 {
     ( new TQVBoxLayout( this ) )->setAutoAdd( true );
     m_widget = 0L;
@@ -677,8 +677,8 @@ void KoStyleParagTab::resizeEvent( TQResizeEvent *e )
     if ( m_widget ) m_widget->resize( size() );
 }
 
-KoStyleFontTab::KoStyleFontTab( TQWidget * tqparent )
-    : KoStyleManagerTab( tqparent )
+KoStyleFontTab::KoStyleFontTab( TQWidget * parent )
+    : KoStyleManagerTab( parent )
 {
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 	TQTabWidget *fontTabContainer = new TQTabWidget( this );
diff --git a/lib/kotext/KoStyleManager.h b/lib/kotext/KoStyleManager.h
index 328668fde..af848e1d2 100644
--- a/lib/kotext/KoStyleManager.h
+++ b/lib/kotext/KoStyleManager.h
@@ -123,7 +123,7 @@ class KOTEXT_EXPORT KoStyleManagerTab : public TQWidget {
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoStyleManagerTab(TQWidget *tqparent) : TQWidget(tqparent) {};
+    KoStyleManagerTab(TQWidget *parent) : TQWidget(parent) {};
 
     /** the new style which is to be displayed */
     void setStyle(KoParagStyle *style) { m_style = style; }
@@ -144,9 +144,9 @@ class KOTEXT_EXPORT KoStyleParagTab : public KoStyleManagerTab
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoStyleParagTab( TQWidget * tqparent );
+    KoStyleParagTab( TQWidget * parent );
 
-    // not a constructor parameter since 'this' is the tqparent of the widget
+    // not a constructor parameter since 'this' is the parent of the widget
     void setWidget( KoParagLayoutWidget * widget );
 
     virtual void update();
@@ -164,7 +164,7 @@ class KOTEXT_EXPORT KoStyleFontTab : public KoStyleManagerTab
     Q_OBJECT
   TQ_OBJECT
 public:
-    KoStyleFontTab( TQWidget * tqparent );
+    KoStyleFontTab( TQWidget * parent );
     ~KoStyleFontTab();
     virtual void update();
     virtual TQString tabName();
diff --git a/lib/kotext/KoTextCustomItem.h b/lib/kotext/KoTextCustomItem.h
index ff7e4ffc1..d232bedcd 100644
--- a/lib/kotext/KoTextCustomItem.h
+++ b/lib/kotext/KoTextCustomItem.h
@@ -83,12 +83,12 @@ public:
 
     virtual void pageBreak( int /*y*/, KoTextFlow* /*flow*/ ) {}
 
-    KoTextDocument *tqparent;
+    KoTextDocument *parent;
 
 
 
     /** The text document in which this customitem is */
-    KoTextDocument * textDocument() const { return tqparent; }
+    KoTextDocument * textDocument() const { return parent; }
 
     /** When the user deletes a custom item, it isn't destroyed but
      * moved into the undo/redo history - setDeleted( true )
diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp
index de81299c3..f981dd264 100644
--- a/lib/kotext/KoTextDocument.cpp
+++ b/lib/kotext/KoTextDocument.cpp
@@ -44,7 +44,7 @@ KoTextDocument::KoTextDocument( KoTextZoomHandler *zoomHandler, KoTextFormatColl
     : m_zoomHandler( zoomHandler ),
       m_bDestroying( false ),
 #ifdef TQTEXTTABLE_AVAILABLE
-      par( 0L /*we don't use tqparent documents */ ),
+      par( 0L /*we don't use parent documents */ ),
       tc( 0 ),
 #endif
       tArray( 0 ), tStopWidth( 0 )
@@ -1288,7 +1288,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx,
                        brush.color() == TQt::white &&
                        is_printer(p));
 
-    bool useDoubleBuffer = !parag->document()->tqparent();
+    bool useDoubleBuffer = !parag->document()->parent();
     if ( is_printer(p) )
         useDoubleBuffer = FALSE;
     // Can't handle transparency using double-buffering, in case of rotation/scaling (due to bitBlt)
diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h
index 1f7739aa4..8cdc1b524 100644
--- a/lib/kotext/KoTextDocument.h
+++ b/lib/kotext/KoTextDocument.h
@@ -65,7 +65,7 @@ public:
     // see below for constructor
     virtual ~KoTextDocument();
 
-    //KoTextDocument *tqparent() const { return par; }
+    //KoTextDocument *parent() const { return par; }
 
     void setText( const TQString &text, const TQString &context );
 
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp
index 27556ed6a..24214ae4b 100644
--- a/lib/kotext/KoTextFormat.cpp
+++ b/lib/kotext/KoTextFormat.cpp
@@ -82,11 +82,11 @@ KoTextFormat::KoTextFormat()
 //#endif
 }
 
-KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, bool hyphenation, KoTextFormatCollection *tqparent )
+KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, bool hyphenation, KoTextFormatCollection *parent )
     : fn( f ), col( c ) /*fm( TQFontMetrics( f ) ),*/ //linkColor( TRUE )
 {
 #ifdef DEBUG_COLLECTION
-    kdDebug(32500) << "KoTextFormat with font & color & tqparent (" << tqparent << "), addRef. " << this << endl;
+    kdDebug(32500) << "KoTextFormat with font & color & parent (" << parent << "), addRef. " << this << endl;
 #endif
     int pointSize;
     if ( f.pointSize() == -1 ) // font was set with a pixelsize, we need a pointsize!
@@ -97,7 +97,7 @@ KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_
     // WYSIWYG works much much better with scalable fonts -> force it to be scalable
     fn.setStyleStrategy( TQFont::ForceOutline );
     ref = 0;
-    collection = tqparent;
+    collection = parent;
     //leftBearing = fm.minLeftBearing();
     //rightBearing = fm.minRightBearing();
     //hei = fm.height();
@@ -188,8 +188,8 @@ KoTextFormat::~KoTextFormat()
     // Removing a format that is in the collection is forbidden, in fact.
     // It should have been removed from the collection before being deleted.
 #ifndef NDEBUG
-    if ( tqparent() && tqparent()->defaultFormat() ) // not when destroying the collection
-        assert( ! ( tqparent()->dict().find( key() ) == this ) );
+    if ( parent() && parent()->defaultFormat() ) // not when destroying the collection
+        assert( ! ( parent()->dict().find( key() ) == this ) );
         // (has to be the same pointer, not only the same key)
 #endif
     delete d;
@@ -1709,7 +1709,7 @@ KoTextFormatCollection::~KoTextFormatCollection()
 
 KoTextFormat *KoTextFormatCollection::format( const KoTextFormat *f )
 {
-    if ( f->tqparent() == this || f == defFormat ) {
+    if ( f->parent() == this || f == defFormat ) {
 #ifdef DEBUG_COLLECTION
         kdDebug(32500) << " format(f) need '" << f->key() << "', best case!" << endl;
 #endif
diff --git a/lib/kotext/KoTextFormat.h b/lib/kotext/KoTextFormat.h
index 25211f54f..0e7c1a13a 100644
--- a/lib/kotext/KoTextFormat.h
+++ b/lib/kotext/KoTextFormat.h
@@ -139,7 +139,7 @@ public:
     /// A simple text format with some default settings
     /// Only used for the default format
     KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language,
-                  bool hyphenation, KoTextFormatCollection *tqparent = 0 );
+                  bool hyphenation, KoTextFormatCollection *parent = 0 );
 
     /// A complete text format (used by KoFontDia)
     KoTextFormat( const TQFont &_font,
@@ -197,8 +197,8 @@ public:
     void setVAlign( VerticalAlignment a );
 
     bool operator==( const KoTextFormat &f ) const;
-    KoTextFormatCollection *tqparent() const;
-    void setCollection( KoTextFormatCollection *tqparent ) { collection = tqparent; }
+    KoTextFormatCollection *parent() const;
+    void setCollection( KoTextFormatCollection *parent ) { collection = parent; }
     TQString key() const;
 
     static TQString getKey( const TQFont &f, const TQColor &c, bool misspelled, VerticalAlignment vAlign );
@@ -476,7 +476,7 @@ inline bool KoTextFormat::operator==( const KoTextFormat &f ) const
     return key() == f.key();
 }
 
-inline KoTextFormatCollection *KoTextFormat::tqparent() const
+inline KoTextFormatCollection *KoTextFormat::parent() const
 {
     return collection;
 }
diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp
index d9a2f054a..30bf6dd35 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -60,8 +60,8 @@ public:
 KoTextObject::KoTextObject( KoTextZoomHandler *zh, const TQFont& defaultFont,
                             const TQString &defaultLanguage, bool hyphenation,
                             KoParagStyle* defaultStyle, int tabStopWidth,
-                            TQObject* tqparent, const char *name )
-    : TQObject( tqparent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this )
+                            TQObject* parent, const char *name )
+    : TQObject( parent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this )
 {
     textdoc = new KoTextDocument( zh, new KoTextFormatCollection( defaultFont, TQColor(),defaultLanguage, hyphenation ) );
     if ( tabStopWidth != -1 )
@@ -70,8 +70,8 @@ KoTextObject::KoTextObject( KoTextZoomHandler *zh, const TQFont& defaultFont,
 }
 
 KoTextObject::KoTextObject( KoTextDocument* _textdoc, KoParagStyle* defaultStyle,
-                            TQObject* tqparent, const char *name )
- : TQObject( tqparent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this )
+                            TQObject* parent, const char *name )
+ : TQObject( parent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this )
 {
     textdoc = _textdoc;
     init();
@@ -2677,7 +2677,7 @@ KCommand *KoTextFormatInterface::setTextSuperScriptCommand(bool on)
 
 KCommand *KoTextFormatInterface::setDefaultFormatCommand()
 {
-    KoTextFormatCollection * coll = currentFormat()->tqparent();
+    KoTextFormatCollection * coll = currentFormat()->parent();
     Q_ASSERT(coll);
     if(coll)
     {
diff --git a/lib/kotext/KoTextObject.h b/lib/kotext/KoTextObject.h
index a463d0fcc..155740754 100644
--- a/lib/kotext/KoTextObject.h
+++ b/lib/kotext/KoTextObject.h
@@ -192,13 +192,13 @@ public:
      * @param defaultHyphenation the default setting for hyphenation (see KoTextFormatCollection)
      * @param defaultStyle the style to use by default (initial pararaph, and when deleting a used style)
      * @param tabStopWidth the global value for the tabstop width
-     * @param tqparent tqparent widget for this object
+     * @param parent parent widget for this object
      * @param name name for this object
      *
      */
     KoTextObject( KoTextZoomHandler *zh, const TQFont& defaultFont, const TQString &defaultLanguage,
                   bool defaultHyphenation, KoParagStyle* defaultStyle, int tabStopWidth = -1,
-                  TQObject* tqparent = 0, const char *name = 0 );
+                  TQObject* parent = 0, const char *name = 0 );
 
     /** Alternative constructor.
      * This constructor allows to use a derived class from KoTextDocument.
@@ -206,11 +206,11 @@ public:
      * @param textdoc the text document to use in this text object. Ownership is transferred
      * to the text object.
      * @param defaultStyle the style to use by default (initial pararaph, and when deleting a used style)
-     * @param tqparent tqparent widget for this object
+     * @param parent parent widget for this object
      * @param name name for this object
      */
     KoTextObject( KoTextDocument *textdoc, KoParagStyle* defaultStyle,
-                  TQObject* tqparent = 0, const char *name = 0 );
+                  TQObject* parent = 0, const char *name = 0 );
 
     virtual ~KoTextObject();
 
@@ -562,7 +562,7 @@ public: // made public for KWTextFrameSet...
         int eid; // id of last parag
         int index; // index (for insertion/deletion)
         Type type; // type of command
-        KoTextObject* textobj; // tqparent
+        KoTextObject* textobj; // parent
         CustomItemsMap customItemsMap; // character position -> qtextcustomitem
         TQValueList<KoParagLayout> oldParagLayouts;
         KoParagLayout newParagLayout;
diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp
index 633bdb58f..23754c285 100644
--- a/lib/kotext/KoTextParag.cpp
+++ b/lib/kotext/KoTextParag.cpp
@@ -1229,7 +1229,7 @@ void KoTextParag::drawLabel( TQPainter* p, int xLU, int yLU, int /*wLU*/, int /*
     else
     {
         TQString counterText = m_layout.counter->text( this );
-        // There are no bullets...any tqparent bullets have already been suppressed.
+        // There are no bullets...any parent bullets have already been suppressed.
         // Just draw the text! Note: one space is always appended.
         if ( !counterText.isEmpty() )
         {
@@ -2708,7 +2708,7 @@ static TQString normalizeWhitespace( const TQString& in, bool leadingSpace )
         // check for space, tab, line feed, carriage return
         if ( ch == ' ' || ch == '\t' ||ch == '\r' ||  ch == '\n')
         {
-            // if we were lead by whitespace in some tqparent or previous sibling element,
+            // if we were lead by whitespace in some parent or previous sibling element,
             // we completely collapse this space
             if ( r != 0 || !leadingSpace )
                 text[w++] = TQChar( ' ' );
@@ -2733,19 +2733,19 @@ static TQString normalizeWhitespace( const TQString& in, bool leadingSpace )
     return text;
 }
 
-void KoTextParag::loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace )
+void KoTextParag::loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace )
 {
     bool dummy;
 
-    return loadOasisSpan( tqparent, context, pos, stripLeadingSpace, &dummy );
+    return loadOasisSpan( parent, context, pos, stripLeadingSpace, &dummy );
 }
 
-void KoTextParag::loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace )
+void KoTextParag::loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace )
 {
-    // Parse every child node of the tqparent
+    // Parse every child node of the parent
     // Can't use forEachElement here since we also care about text nodes
     TQDomNode node;
-    for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() )
+    for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() )
     {
         TQDomElement ts = node.toElement();
         TQString textData;
@@ -2772,7 +2772,7 @@ void KoTextParag::loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& c
             // should only have one space between each of "Foo", "Bar", and "Baz"
             // so we need to keep track of whether there was any trailing whitespace
             // in sub-spans so that we can propogate the whitespace compression state
-            // back up to the tqparent element
+            // back up to the parent element
             loadOasisSpan( ts, context, pos, stripLeadingSpace, hasTrailingSpace ); // recurse
             stripLeadingSpace = *hasTrailingSpace;
             context.styleStack().restore();
@@ -2885,7 +2885,7 @@ KoParagLayout KoTextParag::loadParagLayout( KoOasisContext& context, KoStyleColl
     return tqlayout;
 }
 
-void KoTextParag::loadOasis( const TQDomElement& tqparent, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos )
+void KoTextParag::loadOasis( const TQDomElement& parent, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos )
 {
     // First load tqlayout from style
     KoParagLayout paragLayout = loadParagLayout( context, styleCollection, true );
@@ -2898,7 +2898,7 @@ void KoTextParag::loadOasis( const TQDomElement& tqparent, KoOasisContext& conte
 
     // Load text
     // OO.o compatibility: ignore leading whitespace in <p> and <h> elements
-    loadOasisSpan( tqparent, context, pos, true );
+    loadOasisSpan( parent, context, pos, true );
 
     // Apply default format to trailing space
     const int len = str->length();
@@ -2915,7 +2915,7 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context,
 {
     KoGenStyles& mainStyles = context.mainStyles();
 
-    // Write paragtqlayout to styles (with tqparent == 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();
@@ -3059,7 +3059,7 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context,
             {
                 lastFormatRaw = newFormat;
                 // Remove isMisspelled from format, to avoid useless derived styles
-                // (which would be indentical to their tqparent style)
+                // (which would be indentical to their parent style)
                 KoTextFormat tmpFormat( *newFormat );
                 tmpFormat.setMisspelled( false );
                 newFormat = formatCollection()->format( &tmpFormat );
diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h
index 4ccc21962..e27a9afc5 100644
--- a/lib/kotext/KoTextParag.h
+++ b/lib/kotext/KoTextParag.h
@@ -328,20 +328,20 @@ public:
 
     /**
      * Load a section of text from a oasis based xml tree.
-     * @param tqparent the xml element that has content as tqchildren.
+     * @param parent the xml element that has content as tqchildren.
      * @param context the context
      * @param stripLeadingSpace whether to remove leading literal whitespace
      */
-    void loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace = false );
+    void loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace = false );
 
     /**
      * Load a section of text from a oasis based xml tree.
-     * @param tqparent the xml element that has content as tqchildren.
+     * @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
      */
-    void loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace );
+    void loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace );
 
     void applyListStyle( KoOasisContext& context, int restartNumbering, bool orderedList, bool heading, int level );
 
diff --git a/lib/kotext/KoTextView.h b/lib/kotext/KoTextView.h
index f094053d3..6b9937bb9 100644
--- a/lib/kotext/KoTextView.h
+++ b/lib/kotext/KoTextView.h
@@ -228,7 +228,7 @@ protected:
 
     /** Draws the cursor (or hides it if b is false).
      * The default implementation only changes an internal flag, make sure to reimplement
-     * and to call the tqparent implementation (in all cases)
+     * and to call the parent implementation (in all cases)
      */
     virtual void drawCursor( bool b );
 
diff --git a/lib/kotext/TimeFormatWidget.cpp b/lib/kotext/TimeFormatWidget.cpp
index 34fd7cb21..066039696 100644
--- a/lib/kotext/TimeFormatWidget.cpp
+++ b/lib/kotext/TimeFormatWidget.cpp
@@ -15,11 +15,11 @@
 #include <KoVariable.h>
 
 /*
- *  Constructs a TimeFormatWidget which is a child of 'tqparent', with the
+ *  Constructs a TimeFormatWidget which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
-TimeFormatWidget::TimeFormatWidget( TQWidget* tqparent,  const char* name, WFlags fl )
-    : TimeDateFormatWidgetPrototype( tqparent, name, fl )
+TimeFormatWidget::TimeFormatWidget( TQWidget* parent,  const char* name, WFlags fl )
+    : TimeDateFormatWidgetPrototype( parent, name, fl )
 {
     setCaption( i18n( "TimeFormat", "This Dialog Allows You to Set the Format of the Time Variable" ) );
 
diff --git a/lib/kotext/TimeFormatWidget.h b/lib/kotext/TimeFormatWidget.h
index 62ee6957a..3fd2c8bf7 100644
--- a/lib/kotext/TimeFormatWidget.h
+++ b/lib/kotext/TimeFormatWidget.h
@@ -8,7 +8,7 @@ class TimeFormatWidget : public TimeDateFormatWidgetPrototype
   TQ_OBJECT
 
 public:
-    TimeFormatWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+    TimeFormatWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~TimeFormatWidget();
     TQString resultString();
     int correctValue();
diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic b/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic
index 1726d063c..6ec0f9443 100755
--- a/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic
+++ b/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic
@@ -2183,7 +2183,7 @@ mani1k
 5ma3ri
 mash5
 mas3ko
-tqmask3ro
+mask3ro
 ma5sk^^f6
 mas3ti
 mas4v
diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp
index 361692721..5d5fbe5e1 100644
--- a/lib/kotext/tests/kobordertest.cpp
+++ b/lib/kotext/tests/kobordertest.cpp
@@ -9,8 +9,8 @@
 class MyWidget : public TQWidget
 {
 public:
-    MyWidget( KoZoomHandler* _zh, TQWidget* tqparent )
-        : TQWidget( tqparent ), m_zh(_zh) {
+    MyWidget( KoZoomHandler* _zh, TQWidget* parent )
+        : TQWidget( parent ), m_zh(_zh) {
         tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
     }
 
diff --git a/lib/kross/api/eventslot.h b/lib/kross/api/eventslot.h
index f9736fd0a..aaf1ebba9 100644
--- a/lib/kross/api/eventslot.h
+++ b/lib/kross/api/eventslot.h
@@ -47,7 +47,7 @@ namespace Kross { namespace Api {
              *
              * \param name The name of the EventSlot. The EventSlot
              *       will be accessible by that unique name via
-             *       it's tqparent.
+             *       it's parent.
              * \param receiver The receiver of the event.
              * \param slot The slot of the receiver which this
              *       EventSlot points to.
diff --git a/lib/kross/api/interpreter.h b/lib/kross/api/interpreter.h
index 443585e3e..ebb1a09b2 100644
--- a/lib/kross/api/interpreter.h
+++ b/lib/kross/api/interpreter.h
@@ -94,7 +94,7 @@ namespace Kross { namespace Api {
             /**
              * \return the file-wildcard used to determinate by this interpreter 
              * used scriptingfiles. Those filter will be used e.g. with
-             * KGlobal::dirs()->findAllResources() as filtertqmask. For example
+             * KGlobal::dirs()->findAllResources() as filtermask. For example
              * python just defines it as "*py".
              */
             const TQString getWildcard();
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index ebcf0b00e..b3b29bda3 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -44,15 +44,15 @@ namespace Kross { namespace Api {
     {
         public:
             /**
-             * The \a KXMLGUIClient that is tqparent of the \a ScriptGUIClient
+             * The \a KXMLGUIClient that is parent of the \a ScriptGUIClient
              * instance.
              */
             KXMLGUIClient* guiclient;
 
             /**
-             * The optional tqparent TQWidget widget.
+             * The optional parent TQWidget widget.
              */
-            TQWidget* tqparent;
+            TQWidget* parent;
 
             /**
              * Map of \a ScriptActionCollection instances the \a ScriptGUIClient
@@ -63,15 +63,15 @@ namespace Kross { namespace Api {
 
 }}
 
-ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* tqparent)
-    : TQObject( tqparent )
+ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent)
+    : TQObject( parent )
     , KXMLGUIClient( guiclient )
     , d( new ScriptGUIClientPrivate() ) // initialize d-pointer class
 {
     krossdebug( TQString("ScriptGUIClient::ScriptGUIClient() Ctor") );
 
     d->guiclient = guiclient;
-    d->tqparent = tqparent;
+    d->parent = parent;
 
     setInstance( ScriptGUIClient::instance() );
 
@@ -311,7 +311,7 @@ KURL ScriptGUIClient::openScriptFile(const TQString& caption)
     KFileDialog* filedialog = new KFileDialog(
         TQString(), // startdir
         mimetypes.join(" "), // filter
-        0, // tqparent widget
+        0, // parent widget
         "ScriptGUIClientFileDialog", // name
         true // modal
     );
@@ -374,7 +374,7 @@ bool ScriptGUIClient::executeScriptAction(ScriptAction::Ptr action)
 
 void ScriptGUIClient::showScriptManager()
 {
-    KDialogBase* dialog = new KDialogBase(d->tqparent, "", true, i18n("Scripts Manager"), KDialogBase::Close);
+    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->tqminimumSizeHint()) );
diff --git a/lib/kross/main/scriptguiclient.h b/lib/kross/main/scriptguiclient.h
index af7627206..a835d0a2b 100644
--- a/lib/kross/main/scriptguiclient.h
+++ b/lib/kross/main/scriptguiclient.h
@@ -58,12 +58,12 @@ namespace Kross { namespace Api {
              *
              * \param guiclient The KXMLGUIClient this \a ScriptGUIClient
              *        is a child of.
-             * \param tqparent The tqparent TQWidget. If defined TQt will handle
+             * \param parent The parent TQWidget. If defined TQt will handle
              *        freeing this \a ScriptGUIClient instance else the
              *        caller has to take care of freeing this instance
              *        if not needed any longer.
              */
-            explicit ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* tqparent = 0);
+            explicit ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent = 0);
 
             /**
              * Destructor.
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 781f344b7..d3ab6277a 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -87,7 +87,7 @@ class ListItem : public TQListViewItem
 class ToolTip : public TQToolTip
 {
     public:
-        ToolTip(KListView* tqparent) : TQToolTip(tqparent->viewport()), m_parent(tqparent) {}
+        ToolTip(KListView* parent) : TQToolTip(parent->viewport()), m_parent(parent) {}
         virtual ~ToolTip () { remove(m_parent->viewport()); }
     protected:
         virtual void maybeTip(const TQPoint& p) {
@@ -114,8 +114,8 @@ class WdgScriptsManagerPrivate
     //enum { LoadBtn = 0, UnloadBtn, InstallBtn, UninstallBtn, ExecBtn, NewStuffBtn };
 };
 
-WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* tqparent, const char* name, WFlags fl )
-    : WdgScriptsManagerBase(tqparent, name, fl)
+WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, const char* name, WFlags fl )
+    : WdgScriptsManagerBase(parent, name, fl)
     , d(new WdgScriptsManagerPrivate)
 {
     d->m_scripguiclient = scr;
@@ -254,7 +254,7 @@ void WdgScriptsManager::slotInstallScript()
     KFileDialog* filedialog = new KFileDialog(
         TQString(), // startdir
         "*.tar.gz *.tgz *.bz2", // filter
-        this, // tqparent widget
+        this, // parent widget
         "WdgScriptsManagerInstallFileDialog", // name
         true // modal
     );
diff --git a/lib/kross/main/wdgscriptsmanager.h b/lib/kross/main/wdgscriptsmanager.h
index 349763737..596017ce6 100644
--- a/lib/kross/main/wdgscriptsmanager.h
+++ b/lib/kross/main/wdgscriptsmanager.h
@@ -37,7 +37,7 @@ class WdgScriptsManager : public WdgScriptsManagerBase
     Q_OBJECT
   TQ_OBJECT
     public:
-        WdgScriptsManager(ScriptGUIClient* scr, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0);
+        WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0);
         ~WdgScriptsManager();
     public slots:
         void slotLoadScript();
diff --git a/lib/kross/python/pythonscript.cpp b/lib/kross/python/pythonscript.cpp
index 7d34a6fb8..2329a1d1b 100644
--- a/lib/kross/python/pythonscript.cpp
+++ b/lib/kross/python/pythonscript.cpp
@@ -108,7 +108,7 @@ void PythonScript::initialize()
         // python scripting code.
         Py::Dict moduledict = d->m_module->getDict();
         moduledict["self"] = PythonExtension::toPyObject( m_scriptcontainer );
-        //moduledict["tqparent"] = PythonExtension::toPyObject( m_manager );
+        //moduledict["parent"] = PythonExtension::toPyObject( m_manager );
 
 /*
         // Prepare the local context.
diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py
index 997e98499..9dc8a7999 100755
--- a/lib/kross/python/scripts/gui.py
+++ b/lib/kross/python/scripts/gui.py
@@ -43,43 +43,43 @@ class TkDialog:
 		self.widget = mainframe.widget
 
 	class Widget:
-		def __init__(self, dialog, tqparent):
+		def __init__(self, dialog, parent):
 			self.dialog = dialog
-			self.tqparent = tqparent
+			self.parent = parent
 		#def setVisible(self, visibled): pass
 		#def setEnabled(self, enabled): pass
 
 	class Frame(Widget):
-		def __init__(self, dialog, tqparent):
-			#TkDialog.Widget.__init__(self, dialog, tqparent)
+		def __init__(self, dialog, parent):
+			#TkDialog.Widget.__init__(self, dialog, parent)
 			import Tkinter
-			self.widget = Tkinter.Frame(tqparent)
+			self.widget = Tkinter.Frame(parent)
 			self.widget.pack()
 
 	class Label(Widget):
-		def __init__(self, dialog, tqparent, caption):
-			#TkDialog.Widget.__init__(self, dialog, tqparent)
+		def __init__(self, dialog, parent, caption):
+			#TkDialog.Widget.__init__(self, dialog, parent)
 			import Tkinter
-			self.widget = Tkinter.Label(tqparent, text=caption)
+			self.widget = Tkinter.Label(parent, text=caption)
 			self.widget.pack(side=Tkinter.TOP)
 
 	class CheckBox(Widget):
-		def __init__(self, dialog, tqparent, caption, checked = True):
-			#TkDialog.Widget.__init__(self, dialog, tqparent)
+		def __init__(self, dialog, parent, caption, checked = True):
+			#TkDialog.Widget.__init__(self, dialog, parent)
 			import Tkinter
 			self.checkstate = Tkinter.IntVar()
 			self.checkstate.set(checked)
-			self.widget = Tkinter.Checkbutton(tqparent, text=caption, variable=self.checkstate)
+			self.widget = Tkinter.Checkbutton(parent, text=caption, variable=self.checkstate)
 			self.widget.pack(side=Tkinter.TOP)
 		def isChecked(self):
 			return self.checkstate.get()
 
 	class List(Widget):
-		def __init__(self, dialog, tqparent, caption, items):
-			#TkDialog.Widget.__init__(self, dialog, tqparent)
+		def __init__(self, dialog, parent, caption, items):
+			#TkDialog.Widget.__init__(self, dialog, parent)
 			import Tkinter
 
-			listframe = Tkinter.Frame(tqparent)
+			listframe = Tkinter.Frame(parent)
 			listframe.pack()
 
 			Tkinter.Label(listframe, text=caption).pack(side=Tkinter.LEFT)
@@ -94,10 +94,10 @@ class TkDialog:
 			self.variable.set( self.items[index] )
 
 	class Button(Widget):
-		def __init__(self, dialog, tqparent, caption, commandmethod):
-			#TkDialog.Widget.__init__(self, dialog, tqparent)
+		def __init__(self, dialog, parent, caption, commandmethod):
+			#TkDialog.Widget.__init__(self, dialog, parent)
 			import Tkinter
-			self.widget = Tkinter.Button(tqparent, text=caption, command=self.doCommand)
+			self.widget = Tkinter.Button(parent, text=caption, command=self.doCommand)
 			self.commandmethod = commandmethod
 			self.widget.pack(side=Tkinter.LEFT)
 		def doCommand(self):
@@ -114,10 +114,10 @@ class TkDialog:
 				#self.dialog.root.destroy()
 
 	class Edit(Widget):
-		def __init__(self, dialog, tqparent, caption, text):
-			#TkDialog.Widget.__init__(self, dialog, tqparent)
+		def __init__(self, dialog, parent, caption, text):
+			#TkDialog.Widget.__init__(self, dialog, parent)
 			import Tkinter
-			self.widget = Tkinter.Frame(tqparent)
+			self.widget = Tkinter.Frame(parent)
 			self.widget.pack()
 			label = Tkinter.Label(self.widget, text=caption)
 			label.pack(side=Tkinter.LEFT)
@@ -129,8 +129,8 @@ class TkDialog:
 			return self.entrytext.get()
 
 	class FileChooser(Edit):
-		def __init__(self, dialog, tqparent, caption, initialfile = None, filetypes = None):
-			TkDialog.Edit.__init__(self, dialog, tqparent, caption, initialfile)
+		def __init__(self, dialog, parent, caption, initialfile = None, filetypes = None):
+			TkDialog.Edit.__init__(self, dialog, parent, caption, initialfile)
 			import Tkinter
 
 			self.initialfile = initialfile
@@ -187,27 +187,27 @@ class QtDialog:
 		import qt
 		
 		class Dialog(qt.QDialog):
-			def __init__(self, tqparent = None, name = None, modal = 0, fl = 0):
-				qt.QDialog.__init__(self, tqparent, name, modal, fl)
+			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.tqlayout = qt.QVBoxLayout(self)
 				self.tqlayout.setSpacing(6)
 				self.tqlayout.setMargin(11)
 				
 		class Label(qt.QLabel):
-			def __init__(self, dialog, tqparent, caption):
-				qt.QLabel.__init__(self, tqparent)
+			def __init__(self, dialog, parent, caption):
+				qt.QLabel.__init__(self, parent)
 				self.setText("<qt>%s</qt>" % caption.replace("\n","<br>"))
 				
 		class Frame(qt.QHBox):
-			def __init__(self, dialog, tqparent):
-				qt.QHBox.__init__(self, tqparent)
+			def __init__(self, dialog, parent):
+				qt.QHBox.__init__(self, parent)
 				self.widget = self
 				self.setSpacing(6)
 
 		class Edit(qt.QHBox):
-			def __init__(self, dialog, tqparent, caption, text):
-				qt.QHBox.__init__(self, tqparent)
+			def __init__(self, dialog, parent, caption, text):
+				qt.QHBox.__init__(self, parent)
 				self.setSpacing(6)
 				label = qt.QLabel(caption, self)
 				self.edit = qt.QLineEdit(self)
@@ -219,26 +219,26 @@ class QtDialog:
 
 		class Button(qt.QPushButton):
 			#def __init__(self, *args):
-			def __init__(self, dialog, tqparent, caption, commandmethod):
+			def __init__(self, dialog, parent, caption, commandmethod):
 				#apply(qt.QPushButton.__init__, (self,) + args)
-				qt.QPushButton.__init__(self, tqparent)
+				qt.QPushButton.__init__(self, parent)
 				self.commandmethod = commandmethod
 				self.setText(caption)
 				qt.QObject.connect(self, qt.SIGNAL("clicked()"), self.commandmethod)
 
 
 		class CheckBox(qt.QCheckBox):
-			def __init__(self, dialog, tqparent, caption, checked = True):
-				#TkDialog.Widget.__init__(self, dialog, tqparent)
-				qt.QCheckBox.__init__(self, tqparent)
+			def __init__(self, dialog, parent, caption, checked = True):
+				#TkDialog.Widget.__init__(self, dialog, parent)
+				qt.QCheckBox.__init__(self, parent)
 				self.setText(caption)
 				self.setChecked(checked)
 			#def isChecked(self):
 			#	return self.isChecked()
 
 		class List(qt.QHBox):
-			def __init__(self, dialog, tqparent, caption, items):
-				qt.QHBox.__init__(self, tqparent)
+			def __init__(self, dialog, parent, caption, items):
+				qt.QHBox.__init__(self, parent)
 				self.setSpacing(6)
 				label = qt.QLabel(caption, self)
 				self.combo = qt.QComboBox(self)
@@ -252,9 +252,9 @@ class QtDialog:
 				self.combo.setCurrentItem(index)
 
 		class FileChooser(qt.QHBox):
-			def __init__(self, dialog, tqparent, caption, initialfile = None, filetypes = None):
+			def __init__(self, dialog, parent, caption, initialfile = None, filetypes = None):
 				#apply(qt.QHBox.__init__, (self,) + args)
-				qt.QHBox.__init__(self, tqparent)
+				qt.QHBox.__init__(self, parent)
 				self.setMinimumWidth(400)
 
 				self.initialfile = initialfile
@@ -274,29 +274,29 @@ class QtDialog:
 				return self.edit.text()
 
 			def browseButtonClicked(self):
-				filtertqmask = ""
+				filtermask = ""
 				import types
 				if isinstance(self.filetypes, types.TupleType):
 					for ft in self.filetypes:
 						if len(ft) == 1:
-							filtertqmask += "%s\n" % (ft[0])
+							filtermask += "%s\n" % (ft[0])
 						if len(ft) == 2:
-							filtertqmask += "%s|%s (%s)\n" % (ft[1],ft[0],ft[1])
-				if filtertqmask == "":
-					filtertqmask = "All files (*.*)"
+							filtermask += "%s|%s (%s)\n" % (ft[1],ft[0],ft[1])
+				if filtermask == "":
+					filtermask = "All files (*.*)"
 				else:
-					filtertqmask = filtertqmask[:-1]
+					filtermask = filtermask[:-1]
 					
 				filename = None
 				try:
 					print "QtDialog.FileChooser.browseButtonClicked() kfile.KFileDialog"
 					# try to use the kfile module included in pykde
 					import kfile
-					filename = kfile.KFileDialog.getOpenFileName(self.initialfile, filtertqmask, self, "Save to file")
+					filename = kfile.KFileDialog.getOpenFileName(self.initialfile, filtermask, self, "Save to file")
 				except:
 					print "QtDialog.FileChooser.browseButtonClicked() qt.QFileDialog"
 					# fallback to Qt filedialog
-					filename = qt.QFileDialog.getOpenFileName(self.initialfile, filtertqmask, self, "Save to file")
+					filename = qt.QFileDialog.getOpenFileName(self.initialfile, filtermask, self, "Save to file")
 				if filename != None and filename != "":
 					self.edit.setText(filename)
 					
diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py
index a73538736..985520443 100644
--- a/lib/kross/test/testgui.py
+++ b/lib/kross/test/testgui.py
@@ -44,8 +44,8 @@ class QtTest:
 				apply(qt.QPushButton.__init__, (self,) + args)
 
 		class ComboBox(qt.QHBox):
- 			def __init__(self, tqparent, caption, items = []):
-				qt.QHBox.__init__(self, tqparent)
+ 			def __init__(self, parent, caption, items = []):
+				qt.QHBox.__init__(self, parent)
 				self.setSpacing(6)
 				label = qt.QLabel(str(caption), self)
 				self.combobox = qt.QComboBox(self)
@@ -85,8 +85,8 @@ class QtTest:
 					self.edit.setText(filename)
 
 		class Dialog(qt.QDialog):
-			def __init__(self, tqparent = None, name = None, modal = 0, fl = 0):
-				qt.QDialog.__init__(self, tqparent, name, modal, fl)
+			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.setCaption("Export to HTML")
 				#self.tqlayout()
diff --git a/lib/kross/test/testobject.cpp b/lib/kross/test/testobject.cpp
index 1c7e8e39b..eb687d02a 100644
--- a/lib/kross/test/testobject.cpp
+++ b/lib/kross/test/testobject.cpp
@@ -26,8 +26,8 @@ TestObject::TestObject()
 {
 }
 
-TestObject::TestObject(TQObject* tqparent, Kross::Api::ScriptContainer::Ptr scriptcontainer)
-    : TQObject(tqparent, "TestObject")
+TestObject::TestObject(TQObject* parent, Kross::Api::ScriptContainer::Ptr scriptcontainer)
+    : TQObject(parent, "TestObject")
 {
     connect(this, TQT_SIGNAL(testSignal()), this, TQT_SLOT(testSignalSlot()));
     connect(this, TQT_SIGNAL(stdoutSignal(const TQString&)), this, TQT_SLOT(stdoutSlot(const TQString&)));
diff --git a/lib/kross/test/testobject.h b/lib/kross/test/testobject.h
index 5a04d9dc0..7bbf6f05a 100644
--- a/lib/kross/test/testobject.h
+++ b/lib/kross/test/testobject.h
@@ -34,7 +34,7 @@ class TestObject : public TQObject
 
     public:
         TestObject();
-        TestObject(TQObject* tqparent, Kross::Api::ScriptContainer::Ptr scriptcontainer);
+        TestObject(TQObject* parent, Kross::Api::ScriptContainer::Ptr scriptcontainer);
         ~TestObject();
 
         uint func1(uint);
diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp
index dca95d8a2..f35686060 100644
--- a/lib/store/KoXmlWriter.cpp
+++ b/lib/store/KoXmlWriter.cpp
@@ -72,31 +72,31 @@ void KoXmlWriter::endDocument()
     Q_ASSERT( m_tags.isEmpty() );
 }
 
-// returns the value of indentInside of the tqparent
+// returns the value of indentInside of the parent
 bool KoXmlWriter::prepareForChild()
 {
     if ( !m_tags.isEmpty() ) {
-        Tag& tqparent = m_tags.top();
-        if ( !tqparent.hasChildren ) {
-            closeStartElement( tqparent );
-            tqparent.hasChildren = true;
-            tqparent.lastChildIsText = false;
+        Tag& parent = m_tags.top();
+        if ( !parent.hasChildren ) {
+            closeStartElement( parent );
+            parent.hasChildren = true;
+            parent.lastChildIsText = false;
         }
-        if ( tqparent.indentInside ) {
+        if ( parent.indentInside ) {
             writeIndent();
         }
-        return tqparent.indentInside;
+        return parent.indentInside;
     }
     return true;
 }
 
 void KoXmlWriter::prepareForTextNode()
 {
-    Tag& tqparent = m_tags.top();
-    if ( !tqparent.hasChildren ) {
-        closeStartElement( tqparent );
-        tqparent.hasChildren = true;
-        tqparent.lastChildIsText = true;
+    Tag& parent = m_tags.top();
+    if ( !parent.hasChildren ) {
+        closeStartElement( parent );
+        parent.hasChildren = true;
+        parent.lastChildIsText = true;
     }
 }
 
@@ -104,7 +104,7 @@ void KoXmlWriter::startElement( const char* tagName, bool indentInside )
 {
     Q_ASSERT( tagName != 0 );
 
-    // Tell tqparent that it has tqchildren
+    // Tell parent that it has tqchildren
     bool parentIndent = prepareForChild();
 
     m_tags.push( Tag( tagName, parentIndent && indentInside ) );
diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp
index 344cab544..9da8d2d8f 100644
--- a/lib/store/tests/storedroptest.cpp
+++ b/lib/store/tests/storedroptest.cpp
@@ -9,7 +9,7 @@
 class StoreDropTest : public TQTextBrowser
 {
 public:
-    StoreDropTest( TQWidget* tqparent );
+    StoreDropTest( TQWidget* parent );
 protected:
     virtual void contentsDragEnterEvent( TQDragEnterEvent * e );
     virtual void contentsDragMoveEvent( TQDragMoveEvent * e );
@@ -36,8 +36,8 @@ int main( int argc, char** argv )
     return app.exec();
 }
 
-StoreDropTest::StoreDropTest( TQWidget* tqparent )
-    : TQTextBrowser( tqparent )
+StoreDropTest::StoreDropTest( TQWidget* parent )
+    : TQTextBrowser( parent )
 {
     setText( "KoStore drop/paste test\nDrop or paste a selection from a KOffice application into this widget to see the ZIP contents" );
     setAcceptDrops( true );
diff --git a/plugins/scan/scan.cpp b/plugins/scan/scan.cpp
index a6d646342..5478744ba 100644
--- a/plugins/scan/scan.cpp
+++ b/plugins/scan/scan.cpp
@@ -33,8 +33,8 @@
 typedef KGenericFactory<Scan> ScanFactory;
 K_EXPORT_COMPONENT_FACTORY( kofficescan, ScanFactory( "kscan_plugin" ) )
 
-Scan::Scan(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name), scanDialog( 0 )
+Scan::Scan(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name), scanDialog( 0 )
 {
     setInstance(ScanFactory::instance());
 
@@ -50,7 +50,7 @@ void Scan::slotScan()
 {
     if ( !scanDialog )
     {
-	scanDialog = KScanDialog::getScanDialog( dynamic_cast<TQWidget*>( tqparent() ) );
+	scanDialog = KScanDialog::getScanDialog( dynamic_cast<TQWidget*>( parent() ) );
 	if ( scanDialog )
 	{
 	    scanDialog->setMinimumSize(300, 300);
@@ -76,7 +76,7 @@ void Scan::slotShowImage(const TQImage &img)
     KTempFile temp(locateLocal("tmp", "scandialog"), ".png");
     img.save(temp.name(), "PNG");
 
-    KoView *view = dynamic_cast<KoView *>(tqparent());
+    KoView *view = dynamic_cast<KoView *>(parent());
     if(!view)
 	return;
 
diff --git a/plugins/scan/scan.h b/plugins/scan/scan.h
index 34cebdc30..2cec0fce3 100644
--- a/plugins/scan/scan.h
+++ b/plugins/scan/scan.h
@@ -30,7 +30,7 @@ class Scan : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
     public:
-	Scan(TQObject *tqparent, const char *name, const TQStringList &);
+	Scan(TQObject *parent, const char *name, const TQStringList &);
 	virtual ~Scan();
 	
     private slots:
diff --git a/tools/kfile-plugins/abiword/kfile_abiword.cpp b/tools/kfile-plugins/abiword/kfile_abiword.cpp
index ca130b15c..2f9bb418d 100644
--- a/tools/kfile-plugins/abiword/kfile_abiword.cpp
+++ b/tools/kfile-plugins/abiword/kfile_abiword.cpp
@@ -33,10 +33,10 @@ typedef KGenericFactory<AbiwordPlugin> AbiwordFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_abiword, AbiwordFactory( "kfile_abiword" ))
 
-AbiwordPlugin::AbiwordPlugin(TQObject *tqparent, const char *name,
+AbiwordPlugin::AbiwordPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     init();
 }
diff --git a/tools/kfile-plugins/abiword/kfile_abiword.h b/tools/kfile-plugins/abiword/kfile_abiword.h
index 4aa3a8373..cf6cadca9 100644
--- a/tools/kfile-plugins/abiword/kfile_abiword.h
+++ b/tools/kfile-plugins/abiword/kfile_abiword.h
@@ -31,7 +31,7 @@ class AbiwordPlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-    AbiwordPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    AbiwordPlugin( TQObject *parent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 
diff --git a/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp b/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp
index ad29c130c..145f318b1 100644
--- a/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp
+++ b/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp
@@ -33,10 +33,10 @@ typedef KGenericFactory<GnumericPlugin> GnumericFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_gnumeric, GnumericFactory( "kfile_gnumeric" ))
 
-GnumericPlugin::GnumericPlugin(TQObject *tqparent, const char *name,
+GnumericPlugin::GnumericPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     init();
 }
diff --git a/tools/kfile-plugins/gnumeric/kfile_gnumeric.h b/tools/kfile-plugins/gnumeric/kfile_gnumeric.h
index deeb773c0..dbf6c3129 100644
--- a/tools/kfile-plugins/gnumeric/kfile_gnumeric.h
+++ b/tools/kfile-plugins/gnumeric/kfile_gnumeric.h
@@ -31,7 +31,7 @@ class GnumericPlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-    GnumericPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    GnumericPlugin( TQObject *parent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 
diff --git a/tools/kfile-plugins/koffice/kfile_koffice.cpp b/tools/kfile-plugins/koffice/kfile_koffice.cpp
index 88d7fe8b8..05cd22eff 100644
--- a/tools/kfile-plugins/koffice/kfile_koffice.cpp
+++ b/tools/kfile-plugins/koffice/kfile_koffice.cpp
@@ -33,10 +33,10 @@ typedef KGenericFactory<KOfficePlugin> KOfficeFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_koffice, KOfficeFactory( "kfile_koffice" ))
 
-KOfficePlugin::KOfficePlugin(TQObject *tqparent, const char *name,
+KOfficePlugin::KOfficePlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     makeMimeTypeInfo( "application/x-kword" );
     makeMimeTypeInfo( "application/x-kpresenter" );
diff --git a/tools/kfile-plugins/koffice/kfile_koffice.h b/tools/kfile-plugins/koffice/kfile_koffice.h
index 6139570fb..0f187fd8a 100644
--- a/tools/kfile-plugins/koffice/kfile_koffice.h
+++ b/tools/kfile-plugins/koffice/kfile_koffice.h
@@ -31,7 +31,7 @@ class KOfficePlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-    KOfficePlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KOfficePlugin( TQObject *parent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp
index 8b873ac11..fc6ca9c3a 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.cpp
+++ b/tools/kfile-plugins/ooo/kfile_ooo.cpp
@@ -123,10 +123,10 @@ static const char * metadocstat   = "meta:document-statistic";
 static const char * metaname      = "meta:name"    ;
 static const char * metauserdef   = "meta:user-defined";
 static const char * metafile      = "meta.xml"     ;
-KOfficePlugin::KOfficePlugin(TQObject *tqparent, const char *name,
+KOfficePlugin::KOfficePlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
    int i = 0;
    while (mimetypes[i])
@@ -576,12 +576,12 @@ TQDomNode KOfficePlugin::getBaseNode(const TQDomDocument &doc) const
 TQValidator * KOfficePlugin::createValidator(const TQString &,      /* mimetype */
 					    const TQString & ,     /* group */
 					    const TQString &key,
-					    TQObject * tqparent,
+					    TQObject * parent,
 					    const char * name ) const
 {
 	if (key == dclanguage)
 		return new TQRegExpValidator(TQRegExp("[a-zA-Z-]{1,5}"),
-					    tqparent, name);
+					    parent, name);
 	return 0;
 }
 
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.h b/tools/kfile-plugins/ooo/kfile_ooo.h
index b8604260e..8114396f2 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.h
+++ b/tools/kfile-plugins/ooo/kfile_ooo.h
@@ -36,7 +36,7 @@ class KOfficePlugin: public KFilePlugin
 public:
     /**
      * Constructor */
-    KOfficePlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KOfficePlugin( TQObject *parent, const char *name, const TQStringList& args );
     /**
      * Read informations from files and store info in KFileMetaInfo.
      * We currently only parse meta.xml in OOo files.
@@ -55,7 +55,7 @@ public:
     virtual TQValidator* createValidator( const TQString& mimetype,
                                          const TQString &group,
 					 const TQString &key,
-					 TQObject* tqparent,
+					 TQObject* parent,
 					 const char* name) const;
 private:
     bool writeTextNode(TQDomDocument & doc,
diff --git a/tools/spell/main.cc b/tools/spell/main.cc
index 275e3ee94..db6e3fa11 100644
--- a/tools/spell/main.cc
+++ b/tools/spell/main.cc
@@ -45,8 +45,8 @@ K_EXPORT_COMPONENT_FACTORY( libkspelltool, KGenericFactory<SpellChecker> )
  *
  ***************************************************/
 
-SpellChecker::SpellChecker( TQObject* tqparent, const char* name, const TQStringList & )
-    : KDataTool( tqparent, name )
+SpellChecker::SpellChecker( TQObject* parent, const char* name, const TQStringList & )
+    : KDataTool( parent, name )
 {
 }
 
diff --git a/tools/spell/main.h b/tools/spell/main.h
index 7f0c4fe4b..2f8c97d5e 100644
--- a/tools/spell/main.h
+++ b/tools/spell/main.h
@@ -30,7 +30,7 @@ class SpellChecker : public KDataTool
   TQ_OBJECT
 
 public:
-    SpellChecker( TQObject* tqparent, const char* name, const TQStringList & );
+    SpellChecker( TQObject* parent, const char* name, const TQStringList & );
     virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
 };
 
diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc
index 53ef60804..f0ef9bfce 100644
--- a/tools/thesaurus/main.cc
+++ b/tools/thesaurus/main.cc
@@ -62,8 +62,8 @@ K_EXPORT_COMPONENT_FACTORY( libthesaurustool, ThesaurusFactory("thesaurus_tool")
  * Thesaurus *
  ***************************************************/
 
-Thesaurus::Thesaurus(TQObject* tqparent, const char* name, const TQStringList &)
-    : KDataTool(tqparent, name)
+Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
+    : KDataTool(parent, name)
 {
     
     m_dialog = new KDialogBase(KJanusWidget::Plain, TQString(),
diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h
index 6a6460c31..01c276210 100644
--- a/tools/thesaurus/main.h
+++ b/tools/thesaurus/main.h
@@ -66,7 +66,7 @@ class Thesaurus : public KDataTool
   TQ_OBJECT
 
 public:
-    Thesaurus(TQObject* tqparent, const char* name, const TQStringList &);
+    Thesaurus(TQObject* parent, const char* name, const TQStringList &);
     ~Thesaurus();
     virtual bool run(const TQString& command, void* data,
         const TQString& datatype, const TQString& mimetype);
diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt
index e7b38dd72..17cefdf75 100644
--- a/tools/thesaurus/thesaurus.txt
+++ b/tools/thesaurus/thesaurus.txt
@@ -2115,8 +2115,8 @@
 ;subjective;#;personal;prejudiced;unobjective;unverifiable;
 ;personal;#;subjective;
 ;bound;compelled;constrained;obligate;#;obligated;
-;obvious;#;aptqparent;evident;manifest;patent;plain;axiomatic;self-evident;taken for granted;demonstrable;provable;frank;open-and-shut;self-explanatory;transparent;under one's nose;under my nose;under his nose;under her nose;under your nose;under our noses;writ large;
-;aptqparent;evident;manifest;patent;plain;#;obvious;
+;obvious;#;apparent;evident;manifest;patent;plain;axiomatic;self-evident;taken for granted;demonstrable;provable;frank;open-and-shut;self-explanatory;transparent;under one's nose;under my nose;under his nose;under her nose;under your nose;under our noses;writ large;
+;apparent;evident;manifest;patent;plain;#;obvious;
 ;frank;#;obvious;
 ;clear;open;#;unobstructed;
 ;patent;#;unobstructed;
@@ -2332,7 +2332,7 @@
 ;dry;#;plain;
 ;dry;#;plain;
 ;simple;#;plain;
-;fancy;#;aureate;florid;flamboyant;showy;baroque;churrigueresque;churrigueresco;busy;fussy;battlemented;castellated;castled;crenelated;crenellated;dressy;crackle;damascene;damascened;datqmask;elaborate;luxuriant;embattled;crenelated;crenelate;crenellated;crenellate;indented;fanciful;garnished;lacy;lacelike;rich;rococo;vermicular;vermiculate;vermiculated;puff;puffed;
+;fancy;#;aureate;florid;flamboyant;showy;baroque;churrigueresque;churrigueresco;busy;fussy;battlemented;castellated;castled;crenelated;crenellated;dressy;crackle;damascene;damascened;damask;elaborate;luxuriant;embattled;crenelated;crenelate;crenellated;crenellate;indented;fanciful;garnished;lacy;lacelike;rich;rococo;vermicular;vermiculate;vermiculated;puff;puffed;
 ;busy;fussy;#;fancy;
 ;elaborate;luxuriant;#;fancy;
 ;rich;#;fancy;
@@ -3303,8 +3303,8 @@
 ;wicked;#;depraved;evil;vicious;iniquitous;sinful;ungodly;irreclaimable;irredeemable;unredeemable;unreformable;nefarious;villainous;peccable;peccant;heavy;
 ;depraved;evil;vicious;#;wicked;
 ;heavy;#;wicked;
-;visible;seeable;#;aptqparent;circumpolar;in sight;in view;ocular;visual;panoptic;panoptical;telescopic;viewable;
-;aptqparent;#;visible;seeable;
+;visible;seeable;#;apparent;circumpolar;in sight;in view;ocular;visual;panoptic;panoptical;telescopic;viewable;
+;apparent;#;visible;seeable;
 ;ocular;visual;#;visible;seeable;
 ;invisible;unseeable;#;camouflaged;concealed;hidden;out of sight;infrared;lightless;ultraviolet;undetectable;unseen;nonvisual;occult;
 ;concealed;hidden;out of sight;#;invisible;unseeable;
@@ -5013,7 +5013,7 @@
 ;rebirth;Renaissance;renascence;#;revival;resurgence;revitalization;revitalisation;revivification;
 ;presentation;#;activity;
 ;exposure;#;presentation;
-;tqmask;#;concealment;concealing;hiding;
+;mask;#;concealment;concealing;hiding;
 ;cover;covering;screening;masking;#;concealment;concealing;hiding;
 ;burying;burial;#;concealment;concealing;hiding;
 ;placement;location;locating;position;positioning;emplacement;#;activity;
@@ -6446,8 +6446,8 @@
 ;marble;#;sculpture;
 ;marker;#;artifact;artefact;
 ;marker;#;writing implement;
-;tqmask;#;covering;disguise;
-;tqmask;#;protective covering;protective cover;protection;
+;mask;#;covering;disguise;
+;mask;#;protective covering;protective cover;protection;
 ;master;master copy;original;#;creation;
 ;match;lucifer;friction match;#;lighter;light;igniter;ignitor;
 ;match;mate;#;duplicate;duplication;
@@ -10723,7 +10723,7 @@
 ;party;#;social gathering;social affair;
 ;dance;#;party;
 ;ball;#;dance;
-;masquerade;masque;tqmask;#;party;
+;masquerade;masque;mask;#;party;
 ;dinner;dinner party;#;party;
 ;reception;#;party;
 ;tea;#;reception;
@@ -11051,7 +11051,7 @@
 ;hilltop;brow;#;peak;crown;crest;top;tip;summit;
 ;holy place;sanctum;holy;#;topographic point;place;spot;
 ;home;#;beginning;origin;root;rootage;source;
-;horizon;aptqparent horizon;visible horizon;sensible horizon;skyline;#;line;
+;horizon;apparent horizon;visible horizon;sensible horizon;skyline;#;line;
 ;horizon;celestial horizon;#;great circle;
 ;see;#;seat;
 ;reservation;reserve;#;administrative district;administrative division;territorial division;
@@ -11933,7 +11933,7 @@
 ;custodian;keeper;steward;#;defender;guardian;protector;shielder;
 ;customer;client;#;consumer;
 ;client;#;case;
-;dad;dada;daddy;pa;papa;pappa;pater;pop;#;father;male tqparent;begetter;
+;dad;dada;daddy;pa;papa;pappa;pater;pop;#;father;male parent;begetter;
 ;dame;doll;wench;skirt;chick;bird;#;girl;miss;missy;young lady;young woman;fille;
 ;dame;madam;ma'am;lady;gentlewoman;#;woman;adult female;
 ;dancer;professional dancer;#;performer;performing artist;
@@ -12014,7 +12014,7 @@
 ;fancier;enthusiast;#;admirer;adorer;
 ;fare;#;passenger;rider;
 ;farmer;husbandman;granger;sodbuster;#;creator;
-;father;male tqparent;begetter;#;tqparent;
+;father;male parent;begetter;#;parent;
 ;Father;Padre;#;priest;
 ;father;#;leader;
 ;fellow;buster;#;man;adult male;
@@ -12060,8 +12060,8 @@
 ;girlfriend;#;woman;adult female;friend;
 ;god;#;superior;higher-up;superordinate;
 ;governor;#;politician;
-;grandfather;gramps;granddad;grandad;granddaddy;grandpa;#;grandtqparent;
-;grandma;grandmother;granny;grannie;gran;#;grandtqparent;
+;grandfather;gramps;granddad;grandad;granddaddy;grandpa;#;grandparent;
+;grandma;grandmother;granny;grannie;gran;#;grandparent;
 ;grip;#;skilled worker;trained worker;
 ;guard;#;lineman;
 ;prison guard;jailer;jailor;gaoler;screw;turnkey;#;lawman;law officer;peace officer;keeper;
@@ -12160,7 +12160,7 @@
 ;lout;klutz;clod;stumblebum;goon;oaf;lubber;lummox;lump;gawk;#;clumsy person;
 ;luminary;leading light;guiding light;notable;notability;#;celebrity;famous person;
 ;light;#;friend;
-;ma;mama;mamma;mom;momma;mommy;mammy;mum;mummy;mater;#;mother;female tqparent;
+;ma;mama;mamma;mom;momma;mommy;mammy;mum;mummy;mater;#;mother;female parent;
 ;machine;#;person;individual;someone;somebody;mortal;human;soul;
 ;machinist;mechanic;shop mechanic;#;craftsman;artisan;journeyman;artificer;
 ;madame;#;dame;madam;ma'am;lady;gentlewoman;
@@ -12217,7 +12217,7 @@
 ;ideal;paragon;nonpareil;saint;apotheosis;nonesuch;nonsuch;#;model;role model;
 ;modern;#;person;individual;someone;somebody;mortal;human;soul;
 ;monster;fiend;devil;demon;ogre;#;unpleasant person;disagreeable person;
-;mother;female tqparent;#;tqparent;
+;mother;female parent;#;parent;
 ;mother;#;old woman;
 ;mouth;#;eater;feeder;devourer;
 ;mouthpiece;mouth;#;spokesperson;interpreter;representative;voice;
@@ -12262,7 +12262,7 @@
 ;painter;#;artist;creative person;
 ;painter;#;skilled worker;trained worker;
 ;paratrooper;para;#;soldier;
-;tqparent;#;genitor;
+;parent;#;genitor;
 ;participant;#;associate;
 ;partner;#;person;individual;someone;somebody;mortal;human;soul;
 ;party;#;person;individual;someone;somebody;mortal;human;soul;
@@ -12824,7 +12824,7 @@
 ;Marx;Leonard Marx;Chico;#;comedian;comic;
 ;Marx;Arthur Marx;Harpo;#;comedian;comic;
 ;Marx;Herbert Marx;Zeppo;#;comedian;comic;
-;Mary;Virgin Mary;The Virgin;Madonna;#;Jewess;mother;female tqparent;
+;Mary;Virgin Mary;The Virgin;Madonna;#;Jewess;mother;female parent;
 ;Matthew;Saint Matthew;St Matthew;Saint Matthew the Apostle;St Matthew the Apostle;Levi;#;Apostle;Evangelist;
 ;Maxwell;J. C. Maxwell;James Clerk Maxwell;#;physicist;
 ;Mill;John Mill;John Stuart Mill;#;philosopher;economist;economic expert;
@@ -13046,7 +13046,7 @@
 ;aerodynamic lift;lift;#;aerodynamic force;
 ;slipstream;airstream;race;backwash;wash;#;flow;
 ;alternating current;AC;#;electricity;electrical energy;
-;aptqparent motion;motion;aptqparent movement;movement;#;optical illusion;
+;apparent motion;motion;apparent movement;movement;#;optical illusion;
 ;attraction;attractive force;#;force;
 ;beam;beam of light;light beam;ray;ray of light;shaft;shaft of light;#;light;visible light;visible radiation;
 ;beam;ray;electron beam;#;electromagnetic radiation;electromagnetic wave;nonparticulate radiation;
@@ -17602,9 +17602,9 @@
 ;seal;#;affix;stick on;
 ;adhere;hold fast;bond;bind;stick;stick to;#;attach;
 ;nail;#;attach;
-;tqmask;#;cover;
-;tqmask;block out;#;cover;
-;tqmask;#;cover;
+;mask;#;cover;
+;mask;block out;#;cover;
+;mask;#;cover;
 ;blanket;#;cover;
 ;string;#;change;alter;
 ;string;thread;draw;#;arrange;set up;
@@ -19276,7 +19276,7 @@
 ;earth;#;hide;
 ;cover;#;hide;conceal;
 ;bury;#;hide;conceal;
-;dissemble;cloak;tqmask;#;disguise;
+;dissemble;cloak;mask;#;disguise;
 ;cover;cover up;#;hide;conceal;
 ;harbor;harbour;shield;#;hide;conceal;
 ;show;demo;exhibit;present;demonstrate;#;show;
@@ -20179,8 +20179,8 @@
 ;intervene;step in;interfere;interpose;#;interact;
 ;dominate;master;#;control;command;
 ;undertake;take in charge;#;accept;consent;go for;
-;rear;raise;bring up;nurture;tqparent;#
-;foster;#;rear;raise;bring up;nurture;tqparent;
+;rear;raise;bring up;nurture;parent;#
+;foster;#;rear;raise;bring up;nurture;parent;
 ;serve;attend to;wait on;attend;assist;#;help;assist;aid;
 ;service;serve;#;function;work;operate;go;run;
 ;represent;#;serve;